summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xscripts/install.sh6
-rw-r--r--target/collections/mpd58
-rw-r--r--target/collections/mpdbox57
-rw-r--r--target/collections/ympd9
4 files changed, 73 insertions, 57 deletions
diff --git a/scripts/install.sh b/scripts/install.sh
index a874bfb69..47acc20f4 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -473,9 +473,9 @@ partuuid=$(dd if="$T/firsttrack" bs=1 count=4 skip=$((0x1B8)) 2>/dev/null | \
hexdump -e '1/4 "%08x"')-0$((syspartno+1))
(( quiet )) || print Cleaning out partitions...
-(( datafssz )) && dd if=/dev/zero bs=1048576 count=1 \
- seek=$((cyls - cfgfs - datafssz)) 2>/dev/null
-dd if=/dev/zero bs=1048576 count=1 seek=$((spartofs / 2048)) 2>/dev/null
+(( datafssz )) && dd if=/dev/zero of="$tgt" bs=1048576 count=1 \
+ seek=$((cyls - cfgfs - datafssz))
+dd if=/dev/zero bs=1048576 of="$tgt" count=1 seek=$((spartofs / 2048))
(( quiet )) || if (( grub )); then
print Writing MBR and GRUB2 to target device... system PARTUUID=$partuuid
diff --git a/target/collections/mpd b/target/collections/mpd
new file mode 100644
index 000000000..be6ccf680
--- /dev/null
+++ b/target/collections/mpd
@@ -0,0 +1,58 @@
+config ADK_PKG_MPD
+ bool "Choose packages for MPD system (basic)"
+ default n
+ select BUSYBOX_NTPD
+ select ADK_PACKAGE_CIFS_UTILS
+ select ADK_PACKAGE_LIBMPDCLIENT
+ select ADK_PACKAGE_MPG123
+ select ADK_PACKAGE_MPC
+ select ADK_PACKAGE_MPD
+ select ADK_PACKAGE_MPD_WITH_ALSA
+ select ADK_PACKAGE_MPD_WITH_PULSE
+ select ADK_PACKAGE_MPD_WITH_MP3
+ select ADK_PACKAGE_MPD_WITH_MP4
+ select ADK_PACKAGE_MPD_WITH_OGG
+ select ADK_PACKAGE_MPD_WITH_OPUS
+ select ADK_PACKAGE_MPD_WITH_FLAC
+ select ADK_PACKAGE_MPD_WITH_WAV
+ select ADK_PACKAGE_MPD_WITH_MMS
+ select ADK_PACKAGE_MPD_WITH_FFMPEG
+ select ADK_PACKAGE_MPD_WITH_SHOUT
+ select ADK_PACKAGE_MPD_WITH_CURL
+ select ADK_PACKAGE_MPD_WITH_SAMPLERATE
+ select ADK_PACKAGE_MPD_WITH_HTTPD
+ select ADK_PACKAGE_FILE
+ select ADK_PACKAGE_HTOP
+ select ADK_PACKAGE_DROPBEAR
+ select ADK_PACKAGE_DROPBEAR_WITH_UTMP
+ select ADK_PACKAGE_FFMPEG
+ select ADK_PACKAGE_FFPROBE
+ select ADK_PACKAGE_LIBFFMPEG
+ select ADK_PACKAGE_LIBFFMPEG_WITH_X264
+ select ADK_PACKAGE_LIBFFMPEG_WITH_AAC
+ select ADK_PACKAGE_LIBFFMPEG_WITH_MP3
+ select ADK_PACKAGE_LIBFFMPEG_WITH_VP8
+ select ADK_PACKAGE_LIBFFMPEG_WITH_THEORA
+ select ADK_PACKAGE_LIBFFMPEG_WITH_XVID
+ select ADK_PACKAGE_LIBFFMPEG_WITH_VORBIS
+ select ADK_PACKAGE_SCREEN
+ select ADK_PACKAGE_VIM
+ select ADK_PACKAGE_E2FSCK
+ select ADK_PACKAGE_ALSA_UTILS
+ select ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER
+ select ADK_RUNTIME_START_SERVICES
+ select ADK_RUNTIME_START_DROPBEAR
+ select ADK_RUNTIME_START_BUSYBOX_NTPD
+ select ADK_RUNTIME_START_BUSYBOX_SYSLOGD
+ select ADK_RUNTIME_START_MPD
+ select ADK_RUNTIME_START_BKEYMAPS
+ select ADK_RUNTIME_START_ALSA_UTILS
+ select ADK_KERNEL_USB_HID
+ select ADK_TARGET_USB_KEYBOARD
+ select ADK_TARGET_USB_MOUSE
+ select ADK_KERNEL_INPUT_KEYBOARD
+ select ADK_KERNEL_INPUT_MOUSE
+ select ADK_KERNEL_INPUT_EVDEV
+ help
+ Create a small mpd system.
+
diff --git a/target/collections/mpdbox b/target/collections/mpdbox
index ca224e403..32bb23794 100644
--- a/target/collections/mpdbox
+++ b/target/collections/mpdbox
@@ -1,41 +1,8 @@
config ADK_PKG_MPDBOX
- bool "Choose packages for MPDBox system"
+ bool "Choose packages for MPD system with WebGUI"
default n
+ select ADK_PKG_MPD
select ADK_PACKAGE_MPDBOX
- select BUSYBOX_NTPD
- select ADK_PACKAGE_CIFS_UTILS
- select ADK_PACKAGE_LIBMPDCLIENT
- select ADK_PACKAGE_MPG123
- select ADK_PACKAGE_MPC
- select ADK_PACKAGE_MPD
- select ADK_PACKAGE_MPD_WITH_ALSA
- select ADK_PACKAGE_MPD_WITH_PULSE
- select ADK_PACKAGE_MPD_WITH_MP3
- select ADK_PACKAGE_MPD_WITH_MP4
- select ADK_PACKAGE_MPD_WITH_OGG
- select ADK_PACKAGE_MPD_WITH_OPUS
- select ADK_PACKAGE_MPD_WITH_FLAC
- select ADK_PACKAGE_MPD_WITH_WAV
- select ADK_PACKAGE_MPD_WITH_MMS
- select ADK_PACKAGE_MPD_WITH_FFMPEG
- select ADK_PACKAGE_MPD_WITH_SHOUT
- select ADK_PACKAGE_MPD_WITH_CURL
- select ADK_PACKAGE_MPD_WITH_SAMPLERATE
- select ADK_PACKAGE_MPD_WITH_HTTPD
- select ADK_PACKAGE_FILE
- select ADK_PACKAGE_HTOP
- select ADK_PACKAGE_DROPBEAR
- select ADK_PACKAGE_DROPBEAR_WITH_UTMP
- select ADK_PACKAGE_FFMPEG
- select ADK_PACKAGE_FFPROBE
- select ADK_PACKAGE_LIBFFMPEG
- select ADK_PACKAGE_LIBFFMPEG_WITH_X264
- select ADK_PACKAGE_LIBFFMPEG_WITH_AAC
- select ADK_PACKAGE_LIBFFMPEG_WITH_MP3
- select ADK_PACKAGE_LIBFFMPEG_WITH_VP8
- select ADK_PACKAGE_LIBFFMPEG_WITH_THEORA
- select ADK_PACKAGE_LIBFFMPEG_WITH_XVID
- select ADK_PACKAGE_LIBFFMPEG_WITH_VORBIS
select ADK_PACKAGE_LIGHTTPD
select ADK_PACKAGE_LIGHTTPD_WITH_IPV6
select ADK_PACKAGE_LIGHTTPD_WITH_SSL
@@ -47,26 +14,8 @@ config ADK_PKG_MPDBOX
select ADK_PACKAGE_PHP_MOD_SOCKETS
select ADK_PACKAGE_PHP_MOD_JSON
select ADK_PACKAGE_PHP_FASTCGI
- select ADK_PACKAGE_SCREEN
- select ADK_PACKAGE_VIM
- select ADK_PACKAGE_E2FSCK
- select ADK_PACKAGE_ALSA_UTILS
- select ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER
- select ADK_RUNTIME_START_SERVICES
- select ADK_RUNTIME_START_DROPBEAR
- select ADK_RUNTIME_START_BUSYBOX_NTPD
- select ADK_RUNTIME_START_BUSYBOX_SYSLOGD
- select ADK_RUNTIME_START_MPD
select ADK_RUNTIME_START_PHP
select ADK_RUNTIME_START_LIGHTTPD
- select ADK_RUNTIME_START_BKEYMAPS
- select ADK_RUNTIME_START_ALSA_UTILS
- select ADK_KERNEL_USB_HID
- select ADK_TARGET_USB_KEYBOARD
- select ADK_TARGET_USB_MOUSE
- select ADK_KERNEL_INPUT_KEYBOARD
- select ADK_KERNEL_INPUT_MOUSE
- select ADK_KERNEL_INPUT_EVDEV
help
- Create a small mpdbox.
+ Create a small mpd box with web gui written in php.
diff --git a/target/collections/ympd b/target/collections/ympd
new file mode 100644
index 000000000..b09591400
--- /dev/null
+++ b/target/collections/ympd
@@ -0,0 +1,9 @@
+config ADK_PKG_YMPD
+ bool "Choose packages for MPD system with Ympd"
+ default n
+ select ADK_PKG_MPD
+ select ADK_PACKAGE_YMPD
+ select ADK_RUNTIME_START_YMPD
+ help
+ Create a small mpd box with web gui written in C.
+