From 72d22eb4b3ba1f4eccffa1383a80e9f24ac2968b Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 10 Feb 2015 14:40:51 +0100 Subject: add appliance options support --- scripts/create-menu | 8 +++-- target/appliances/000default | 6 ---- target/appliances/000default.appliance | 6 ++++ target/appliances/kodi | 34 -------------------- target/appliances/kodi.appliance | 34 ++++++++++++++++++++ target/appliances/mpd | 59 ---------------------------------- target/appliances/mpd.appliance | 59 ++++++++++++++++++++++++++++++++++ target/appliances/test | 8 ----- target/appliances/test.appliance | 8 +++++ 9 files changed, 113 insertions(+), 109 deletions(-) delete mode 100644 target/appliances/000default create mode 100644 target/appliances/000default.appliance delete mode 100644 target/appliances/kodi create mode 100644 target/appliances/kodi.appliance delete mode 100644 target/appliances/mpd create mode 100644 target/appliances/mpd.appliance delete mode 100644 target/appliances/test create mode 100644 target/appliances/test.appliance diff --git a/scripts/create-menu b/scripts/create-menu index 94698e8d1..8bd7de4b3 100755 --- a/scripts/create-menu +++ b/scripts/create-menu @@ -20,8 +20,12 @@ if [ -d "$topdir/target/appliances" ];then printf "config ADK_CHOOSE_APPLIANCE\n" >> $topdir/target/config/Config.in.appliances printf "\tprompt \"choose an appliance\"\n" >> $topdir/target/config/Config.in.appliances printf "\tboolean\n\n" >> $topdir/target/config/Config.in.appliances - cat $topdir/target/appliances/* >> $topdir/target/config/Config.in.appliances 2>/dev/null - printf "\nendchoice\n" >> $topdir/target/config/Config.in.appliances + cat $topdir/target/appliances/*.appliance >> $topdir/target/config/Config.in.appliances 2>/dev/null + printf "\nendchoice\n\n" >> $topdir/target/config/Config.in.appliances + printf "menu \"Appliance Options\"\n" >> $topdir/target/config/Config.in.appliances + printf "\tvisible if !ADK_CHOOSE_APPLIANCE\n" >> $topdir/target/config/Config.in.appliances + cat $topdir/target/appliances/*.options >> $topdir/target/config/Config.in.appliances 2>/dev/null + printf "endmenu\n" >> $topdir/target/config/Config.in.appliances fi # create system default diff --git a/target/appliances/000default b/target/appliances/000default deleted file mode 100644 index 9c8aac7d0..000000000 --- a/target/appliances/000default +++ /dev/null @@ -1,6 +0,0 @@ -config ADK_APPLIANCE_NEW - prompt "create a new appliance" - boolean - help - Create a new appliance from scratch. - diff --git a/target/appliances/000default.appliance b/target/appliances/000default.appliance new file mode 100644 index 000000000..9c8aac7d0 --- /dev/null +++ b/target/appliances/000default.appliance @@ -0,0 +1,6 @@ +config ADK_APPLIANCE_NEW + prompt "create a new appliance" + boolean + help + Create a new appliance from scratch. + diff --git a/target/appliances/kodi b/target/appliances/kodi deleted file mode 100644 index b0e5acc16..000000000 --- a/target/appliances/kodi +++ /dev/null @@ -1,34 +0,0 @@ -config ADK_APPLIANCE_KODI - bool "kodi multimedia appliance" - select ADK_TARGET_LIB_GLIBC - select ADK_PACKAGE_GLIBC - select ADK_PACKAGE_GLIBC_GCONV - select ADK_PACKAGE_KODI - select ADK_PACKAGE_KODI_WITH_SMB - select ADK_PACKAGE_KODI_WITH_NFS - select ADK_PACKAGE_KODI_WITH_SSH - select ADK_PACKAGE_KODI_WITH_CEC - select ADK_PACKAGE_KODI_WITH_RTMP - select ADK_PACKAGE_KODI_WITH_BLURAY - select ADK_PACKAGE_KODI_WITH_WEBSERVER - select ADK_PACKAGE_HTOP - select ADK_PACKAGE_DROPBEAR - select ADK_PACKAGE_DROPBEAR_WITH_UTMP - 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 BUSYBOX_NTPD - 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_KODI - select ADK_KERNEL_INPUT_EVDEV m - select ADK_KERNEL_USB_HID m - select ADK_TARGET_USB_KEYBOARD - select ADK_TARGET_USB_MOUSE - help - Create a small kodi multimedia appliance. - diff --git a/target/appliances/kodi.appliance b/target/appliances/kodi.appliance new file mode 100644 index 000000000..b0e5acc16 --- /dev/null +++ b/target/appliances/kodi.appliance @@ -0,0 +1,34 @@ +config ADK_APPLIANCE_KODI + bool "kodi multimedia appliance" + select ADK_TARGET_LIB_GLIBC + select ADK_PACKAGE_GLIBC + select ADK_PACKAGE_GLIBC_GCONV + select ADK_PACKAGE_KODI + select ADK_PACKAGE_KODI_WITH_SMB + select ADK_PACKAGE_KODI_WITH_NFS + select ADK_PACKAGE_KODI_WITH_SSH + select ADK_PACKAGE_KODI_WITH_CEC + select ADK_PACKAGE_KODI_WITH_RTMP + select ADK_PACKAGE_KODI_WITH_BLURAY + select ADK_PACKAGE_KODI_WITH_WEBSERVER + select ADK_PACKAGE_HTOP + select ADK_PACKAGE_DROPBEAR + select ADK_PACKAGE_DROPBEAR_WITH_UTMP + 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 BUSYBOX_NTPD + 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_KODI + select ADK_KERNEL_INPUT_EVDEV m + select ADK_KERNEL_USB_HID m + select ADK_TARGET_USB_KEYBOARD + select ADK_TARGET_USB_MOUSE + help + Create a small kodi multimedia appliance. + diff --git a/target/appliances/mpd b/target/appliances/mpd deleted file mode 100644 index abf753925..000000000 --- a/target/appliances/mpd +++ /dev/null @@ -1,59 +0,0 @@ -config ADK_APPLIANCE_MPD - bool "music player daemon appliance" - 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_SNDFILE - select ADK_PACKAGE_MPD_WITH_HTTPD - select ADK_PACKAGE_CIFS_UTILS - select ADK_PACKAGE_LIBMPDCLIENT - select ADK_PACKAGE_MPG123 - select ADK_PACKAGE_MPC - 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 BUSYBOX_NTPD - 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_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 - select ADK_RUNTIME_HOSTNAME mpdbox - select ADK_KERNEL_USB_STORAGE m - help - Create a small music player daemon appliance. - diff --git a/target/appliances/mpd.appliance b/target/appliances/mpd.appliance new file mode 100644 index 000000000..abf753925 --- /dev/null +++ b/target/appliances/mpd.appliance @@ -0,0 +1,59 @@ +config ADK_APPLIANCE_MPD + bool "music player daemon appliance" + 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_SNDFILE + select ADK_PACKAGE_MPD_WITH_HTTPD + select ADK_PACKAGE_CIFS_UTILS + select ADK_PACKAGE_LIBMPDCLIENT + select ADK_PACKAGE_MPG123 + select ADK_PACKAGE_MPC + 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 BUSYBOX_NTPD + 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_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 + select ADK_RUNTIME_HOSTNAME mpdbox + select ADK_KERNEL_USB_STORAGE m + help + Create a small music player daemon appliance. + diff --git a/target/appliances/test b/target/appliances/test deleted file mode 100644 index 57b156acd..000000000 --- a/target/appliances/test +++ /dev/null @@ -1,8 +0,0 @@ -config ADK_APPLIANCE_TEST - bool "automatic test system appliance" - select ADK_PACKAGE_ADKTEST - select ADK_RUNTIME_START_SERVICES - select ADK_RUNTIME_START_ADKTEST - help - Create a small appliance for automatic testing. - diff --git a/target/appliances/test.appliance b/target/appliances/test.appliance new file mode 100644 index 000000000..57b156acd --- /dev/null +++ b/target/appliances/test.appliance @@ -0,0 +1,8 @@ +config ADK_APPLIANCE_TEST + bool "automatic test system appliance" + select ADK_PACKAGE_ADKTEST + select ADK_RUNTIME_START_SERVICES + select ADK_RUNTIME_START_ADKTEST + help + Create a small appliance for automatic testing. + -- cgit v1.2.3