diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2016-03-05 12:51:42 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2016-03-07 06:42:57 +0100 |
commit | c384dc577bd32f3315bacb410fc31610b41f742c (patch) | |
tree | 903aaed00f4b82d5e1eada2bd4fea8a7f3387ded /package | |
parent | 68d4e79f35039b31ae835e82241a567b0ad66aa8 (diff) |
rework menu based config system
After the addition of bare metal toolchains the menu system allowed
to create non-valid configurations. I reworked it so we can also
add other operating system support if we wish.
So first you choose your operating system, then your architecture
and endianess, after that your embedded system, emulator or
generic device and then you choose your task you want to run.
Tasks may be toolchain, a new appliance/application or some preconfigured
sets of packages and configurations as kodi, mpd, firefox and more.
The tasks are limited to a plausible choice of hardware and software.
Deduplicate CPU configuration.
You don't wanna compile Kodi for a H8/300 microcontroller ;)
Diffstat (limited to 'package')
-rw-r--r-- | package/Config.in.options | 72 | ||||
-rw-r--r-- | package/boost/Makefile | 4 | ||||
-rw-r--r-- | package/ffmpeg/Makefile | 3 | ||||
-rw-r--r-- | package/kodi/Makefile | 3 | ||||
-rw-r--r-- | package/libgcc/Makefile | 4 | ||||
-rw-r--r-- | package/libvpx/Makefile | 2 | ||||
-rw-r--r-- | package/mpg123/Makefile | 4 |
7 files changed, 80 insertions, 12 deletions
diff --git a/package/Config.in.options b/package/Config.in.options new file mode 100644 index 000000000..a806da895 --- /dev/null +++ b/package/Config.in.options @@ -0,0 +1,72 @@ +config ADK_PACKAGE_SUFFIX + string + default "ipk" if ADK_TARGET_PACKAGE_IPKG + default "ipk" if ADK_TARGET_PACKAGE_OPKG + default "tar.xz" if ADK_TARGET_PACKAGE_TXZ + +choice +prompt "Package format" +default ADK_TARGET_PACKAGE_TXZ + +config ADK_TARGET_PACKAGE_TXZ + bool "xz compressed tar archive" + help + Create compressed tar archives of packages. + Pre- and post install scripts will be executed in the target + directory. There will be no package manager installed onto the target. + +config ADK_TARGET_PACKAGE_IPKG + bool "ipkg" + select BUSYBOX_IPKG + help + Create ipkg packages and use ipkg package management on the target. + +config ADK_TARGET_PACKAGE_OPKG + bool "opkg" + select ADK_PACKAGE_OPKG + select ADK_HOST_NEED_OPKG + help + Create opkg packages and use opkg package management on the target. + +endchoice +config ADK_LEAVE_ETC_ALONE + bool "do not install anything into /etc" + default n + help + Enabling this option will prevent the ADK from installing anything + into /etc. This is useful for highly customised setups with custom + base-files packages. + + Package Makefiles can override this setting by passing "force_etc" to + the package-template. to a non-empty value. This is useful for + packages traditionally installing non-config stuff into /etc, like + e.g. ca-certificates. + + Note that without further customisation, turning this option + on will almost certainly render the resulting system unusable. + +config ADK_INSTALL_PACKAGE_INIT_SCRIPTS + bool "ship custom init-scripts along with packages" + default y + depends on !ADK_LEAVE_ETC_ALONE + help + Turning this option to false will prevent the ADK from + installing init-scripts (i.e. files in /etc/init.d) for + certain daemons and daemon-like applications. + + Note that without further customisation, turning this option + off will almost certainly render the resulting system unusable. + +config ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS + bool "ship custom network-scripts along with packages" + default y + depends on !ADK_LEAVE_ETC_ALONE + help + Turning this option to false will prevent the ADK from + installing network-scripts (i.e. files in /etc/network/) for + packages providing any. + + Note that without further customisation, turning this option + off will almost certainly render the resulting system unusable. + + diff --git a/package/boost/Makefile b/package/boost/Makefile index dd08b0f34..8fee53109 100644 --- a/package/boost/Makefile +++ b/package/boost/Makefile @@ -107,10 +107,10 @@ endif ifeq ($(ADK_TARGET_ARCH),ppc) BOOST_ARCH:= power endif -ifeq ($(ADK_CPU_MIPS32),y) +ifeq ($(ADK_TARGET_CPU_MIPS_MIPS32),y) BOOST_ARCH:= mips32 endif -ifeq ($(ADK_CPU_MIPS32R2),y) +ifeq ($(ADK_TARGET_CPU_MIPS_MIPS32R2),y) BOOST_ARCH:= mips32r2 endif diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index f3f69ab26..f91bf3347 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -154,11 +154,10 @@ endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) CONFIGURE_CPU_OPTS:= --enable-armv6 endif -ifeq ($(ADK_CPU_MIPS32),y) +ifeq ($(ADK_TARGET_CPU_MIPS_MIPS32),y) CONFIGURE_CPU_OPTS+= --disable-mipsdspr1 --disable-mipsdspr2 endif - CONFIG_STYLE:= minimal CONFIGURE_ARGS:= --prefix=/usr \ --target-os=linux \ diff --git a/package/kodi/Makefile b/package/kodi/Makefile index 6624394ef..8a0eabff3 100644 --- a/package/kodi/Makefile +++ b/package/kodi/Makefile @@ -69,9 +69,6 @@ PKGFS_WITH_LIRC:= lirc PKGFD_WITH_WEBSERVER:= enable internal webserver support PKG_BUILDDEP_SOLIDRUN_IMX6:= gpu-viv-bin-mx6q - -# freescale GL libraries linked against glibc -PKG_LIBC_DEPENDS:= glibc uclibc-ng PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2 solidrun-imx6 DIFF_IGNOREFILES:= configure missing depcomp install-sh INSTALL \ diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile index 9926ed960..36f7ae6f2 100644 --- a/package/libgcc/Makefile +++ b/package/libgcc/Makefile @@ -26,10 +26,10 @@ INSTALL_STYLE:= manual libgcc-install: $(INSTALL_DIR) ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) ifeq ($(ADK_TARGET_ARCH_SH),y) -ifeq ($(ADK_CPU_SH3),y) +ifeq ($(ADK_TARGET_CPU_SH_SH3),y) ${CP} ${STAGING_TARGET_DIR}/usr/lib/!m3*/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) endif -ifeq ($(ADK_CPU_SH4),y) +ifeq ($(ADK_TARGET_CPU_SH_SH4),y) ${CP} ${STAGING_TARGET_DIR}/usr/lib/!m4*/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH) endif else diff --git a/package/libvpx/Makefile b/package/libvpx/Makefile index 18b56e847..3b2fa5ec4 100644 --- a/package/libvpx/Makefile +++ b/package/libvpx/Makefile @@ -44,7 +44,7 @@ endif ifeq ($(ADK_TARGET_ARCH_MIPS),y) CONFIGURE_ARGS+= --target=mips32-linux-gcc endif -ifeq ($(ADK_CPU_LOONGSON2F),y) +ifeq ($(ADK_TARGET_CPU_MIPS64_LOONGSON2F),y) CONFIGURE_ARGS+= --target=loongson2f-linux-gcc endif ifeq ($(ADK_TARGET_ARCH_MIPS64),y) diff --git a/package/mpg123/Makefile b/package/mpg123/Makefile index 7629c9a86..28d9b74ca 100644 --- a/package/mpg123/Makefile +++ b/package/mpg123/Makefile @@ -23,10 +23,10 @@ $(eval $(call PKG_template,MPG123,mpg123,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP AUTOTOOL_STYLE:= autoreconf -ifeq ($(ADK_CPU_I486),y) +ifeq ($(ADK_TARGET_CPU_X86_I486),y) CONFIGURE_ARGS+= --with-cpu=i486 endif -ifeq ($(ADK_CPU_I586),y) +ifeq ($(ADK_TARGET_CPU_X86_I586),y) CONFIGURE_ARGS+= --with-cpu=i586 endif ifeq ($(ADK_TARGET_CPU_WITH_NEON),y) |