diff options
Diffstat (limited to 'conf/distro/minimal.conf')
| -rw-r--r-- | conf/distro/minimal.conf | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf index f42f1b6758..72169765c9 100644 --- a/conf/distro/minimal.conf +++ b/conf/distro/minimal.conf @@ -16,7 +16,7 @@ DISTRO_VERSION = "dev-snapshot-${SRCDATE}" DISTRO_TYPE ?= "debug" # Ensure some form of release config, so error out if someone thinks he knows better -DISTRO_CHECK := "${@bb.data.getVar('DISTRO_VERSION',d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION") +DISTRO_CHECK := "${@bb.data.getVar('DISTRO_VERSION',d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION')}" ############################################################################# # FEATURE SELECTION @@ -24,7 +24,7 @@ DISTRO_CHECK := "${@bb.data.getVar('DISTRO_VERSION',d,1) or bb.fatal('Remove thi # Use bluetooth 4.0 DISTRO_BLUETOOTH_MANAGER = "bluez4" # We want images supporting the following features (for task-base) -DISTRO_FEATURES = "nfs smbfs wifi ppp alsa ext2 vfat pcmcia usbgadget usbhost pci" +DISTRO_FEATURES = "ipv4 ipv6 nfs smbfs wifi ppp alsa ext2 vfat pcmcia usbgadget usbhost pci" # Following features are for ARM and E500 based machines DISTRO_FEATURES += "eabi" @@ -33,6 +33,7 @@ DISTRO_FEATURES += "eabi" # or higher DISTRO_FEATURES += "mplt" +DISTRO_FEATURES += ' ${@["", "thumb-interwork"][bb.data.getVar('THUMB_INTERWORK', d, 1) == "yes"]}' ############################################################################# # LIBRARY NAMES @@ -58,15 +59,15 @@ PREFERRED_PKG_FORMAT ?= "ipk" INHERIT += "src_distribute_local" SRC_DIST_LOCAL ?= "symlink" -# If we're using an .ipk based rootfs, we want to have opkg-nogpg installed so postinst script can run -IPKG_VARIANT = "opkg-nogpg" +# If we're using an .ipk based rootfs, we want to have opkg installed so postinst script can run +IPKG_VARIANT = "opkg" ############################################################################# # IMAGES ############################################################################# # Name the generated images in a sane way IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${LIBC}-${PREFERRED_PKG_FORMAT}-${DISTRO_VERSION}-${MACHINE}" -CACHE ?= "${TMPDIR}/cache/${LIBC}/${MACHINE}" +CACHE = "${TMPDIR}/cache/${LIBC}/${MACHINE}" DEPLOY_DIR ?= "${TMPDIR}/deploy/${LIBC}" DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" SPLASH ?= '${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)}' @@ -91,6 +92,7 @@ OVERRIDES = "local:${MACHINE}:${MACHINE_CLASS}:${DISTRO}:${TARGET_OS}:${TARGET_A ############################################################################# LIBC ?= "eglibc" require conf/distro/include/sane-toolchain.inc +require conf/distro/include/arm-thumb.inc ############################################################################# # PREFERRED VERSIONS @@ -101,8 +103,8 @@ require conf/distro/include/preferred-e-versions.inc require conf/distro/include/preferred-opie-versions-1.2.4.inc require conf/distro/include/preferred-xorg-versions-X11R7.5.inc -PREFERRED_PROVIDER_opkg ?= "opkg-nogpg" -PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg-nogpg" +PREFERRED_PROVIDER_opkg ?= "opkg" +PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg" ############################################################################# # CONTENTS |