diff options
Diffstat (limited to 'conf')
44 files changed, 7 insertions, 82 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 61c08758b2..98d188375f 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -276,7 +276,6 @@ BUILD_OPTIMIZATION = "-O2" # Bootstrap stuff. ################################################################## -BOOTSTRAP_EXTRA_DEPENDS = "" BOOTSTRAP_EXTRA_RDEPENDS = "" BOOTSTRAP_EXTRA_RRECOMMENDS = "" diff --git a/conf/distro/familiar.conf b/conf/distro/familiar.conf index 0b31c3c5a3..9cc84e96c4 100644 --- a/conf/distro/familiar.conf +++ b/conf/distro/familiar.conf @@ -8,7 +8,6 @@ TARGET_OS = "linux" PARALLEL_INSTALL_MODULES = "1" UDEV_DEVFS_RULES = "1" -BOOTSTRAP_EXTRA_DEPENDS += "familiar-version" BOOTSTRAP_EXTRA_RDEPENDS += "familiar-version" DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}" diff --git a/conf/distro/jlime-shrek.conf b/conf/distro/jlime-shrek.conf index 2dd9641137..c3f88c5511 100644 --- a/conf/distro/jlime-shrek.conf +++ b/conf/distro/jlime-shrek.conf @@ -37,7 +37,6 @@ BBINCLUDELOGS = "yes" MODUTILS = "26" IMAGE_FSTYPES = "tar.bz2" -BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs ncurses nano virtual/kernel wireless-tools console-tools" BOOTSTRAP_EXTRA_RDEPENDS += "pcmcia-cs ncurses nano wireless-tools \ kernel-module-3c574-cs kernel-module-3c589-cs kernel-module-8390 \ kernel-module-airo-cs kernel-module-airo console-tools \ diff --git a/conf/distro/openomap.conf b/conf/distro/openomap.conf index 6f0bca9342..192400b9a1 100644 --- a/conf/distro/openomap.conf +++ b/conf/distro/openomap.conf @@ -8,5 +8,4 @@ TARGET_FPU ?= "soft" # 2.4 vs 2.6 is a distro decision. MODUTILS = "26" -BOOTSTRAP_EXTRA_DEPENDS += "udev" BOOTSTRAP_EXTRA_RDEPENDS += "udev" diff --git a/conf/machine/blueangel.conf b/conf/machine/blueangel.conf index 196cd51ebb..3f90ccf84c 100644 --- a/conf/machine/blueangel.conf +++ b/conf/machine/blueangel.conf @@ -12,9 +12,6 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel_kernel26 = "xanadux-ba-2.6" PREFERRED_PROVIDER_virtual/kernel = "xanadux-ba-2.6" -BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params" -BOOTSTRAP_EXTRA_DEPENDS_append_kernel26 = " xanadux-ba-2.6 udev module-init-tools" - BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${BA_MODULES}', d)}" BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools" diff --git a/conf/machine/borzoi.conf b/conf/machine/borzoi.conf index 83899514f5..185c9f02cb 100644 --- a/conf/machine/borzoi.conf +++ b/conf/machine/borzoi.conf @@ -7,12 +7,10 @@ KERNEL_VERSION ?= "2.6" include conf/machine/include/zaurus-clamshell.conf include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf -PIVOTBOOT_EXTRA_DEPENDS += "pivotinit pcmcia-cs" PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit pcmcia-cs" PIVOTBOOT_EXTRA_RRECOMMENDS += "" # Useful things for the built-in Harddisk -BOOTSTRAP_EXTRA_DEPENDS += "hdparm e2fsprogs" BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs" IMAGE_FSTYPES = "jffs2 tar.gz" diff --git a/conf/machine/colinux.conf b/conf/machine/colinux.conf index 8c66aa1ab4..1af280c2b3 100644 --- a/conf/machine/colinux.conf +++ b/conf/machine/colinux.conf @@ -5,5 +5,4 @@ TARGET_ARCH = "i686" IPKG_ARCHS = "all i686 i386 x86 ${MACHINE}" PREFERRED_PROVIDER_virtual/kernel = "linux-colinux" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel" BOOTSTRAP_EXTRA_RDEPENDS = "kernel kernel-modules" diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index a8226ea04e..3e95848a35 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -6,7 +6,6 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm ${MACHINE}" PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel ?= "collie-kernels-2.4-embedix" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support altboot" BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules-cs \ sharp-sdmmc-support kernel-module-net-fd kernel-module-sa1100-bi \ kernel-module-usbdcore kernel-module-usbdmonitor \ @@ -15,7 +14,6 @@ altboot" # kernel-module-collie-ssp kernel-module-collie-tc35143af if buzzer.patch applied # This is needed for the ramdisk script to work -BOOTSTRAP_EXTRA_DEPENDS += "e2fsprogs" BOOTSTRAP_EXTRA_RDEPENDS += "e2fsprogs-mke2fs" EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n" diff --git a/conf/machine/devkitidp-pxa255.conf b/conf/machine/devkitidp-pxa255.conf index 329ac6816d..39ef40ae16 100644 --- a/conf/machine/devkitidp-pxa255.conf +++ b/conf/machine/devkitidp-pxa255.conf @@ -10,7 +10,7 @@ IPKG_ARCHS = "all arm armv5te ${MACHINE}" PREFERRED_PROVIDER_virtual/bootloader = "uboot-${MACHINE}" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" -BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel virtual/bootloader" +BOOTSTRAP_EXTRA_RDEPENDS += "uboot-${MACHINE} ${MACHINE}-kernel" include conf/machine/include/tune-xscale.conf diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf index 2963131486..0d3bcedee3 100644 --- a/conf/machine/epia.conf +++ b/conf/machine/epia.conf @@ -2,7 +2,6 @@ TARGET_ARCH = "i586" TARGET_VENDOR = "-oe" PREFERRED_PROVIDER_virtual/kernel = "linux-epia" IMAGE_FSTYPE = "ext2.gz" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev" BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev kernel-modules" udevdir = "/dev" OLDEST_KERNEL = "2.6.5" diff --git a/conf/machine/geodegx.conf b/conf/machine/geodegx.conf index 23a08cc99d..e4f56f16e3 100644 --- a/conf/machine/geodegx.conf +++ b/conf/machine/geodegx.conf @@ -6,7 +6,6 @@ TARGET_ARCH = "i486" IPKG_ARCHS = "all i486 geodegx" PREFERRED_PROVIDER_virtual/kernel = "linux-geodegx" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev" BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules" udevdir = "/dev" diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf index 0c602398c7..7ebcccb293 100644 --- a/conf/machine/h1910.conf +++ b/conf/machine/h1910.conf @@ -12,7 +12,6 @@ include conf/machine/include/tune-xscale.conf PREFERRED_PROVIDER_xserver = "xserver-kdrive" -BOOTSTRAP_EXTRA_DEPENDS = "udev apmd irda-utils network-suspend-scripts modutils-collateral mtd-utils" BOOTSTRAP_EXTRA_RDEPENDS = "udev apm apmd network-suspend-scripts modutils-collateral mtd-utils" BOOTSTRAP_EXTRA_RRECOMMENDS += "" diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf index 570dc3be1e..fb4dc8c710 100644 --- a/conf/machine/h1940.conf +++ b/conf/machine/h1940.conf @@ -7,12 +7,10 @@ TARGET_ARCH = arm PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-h1940" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -BOOTSTRAP_EXTRA_DEPENDS = "udev virtual/kernel modutils-collateral module-init-tools" BOOTSTRAP_EXTRA_RDEPENDS = "udev kernel kernel-modules modutils-collateral module-init-tools" HANDHELD_MODULES = "" -BOOTSTRAP_EXTRA_DEPENDS += "apmd wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap network-suspend-scripts" BOOTSTRAP_EXTRA_RDEPENDS += "apm apmd network-suspend-scripts" BOOTSTRAP_EXTRA_RRECOMMENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap ${@linux_module_packages('${HANDHELD_MODULES}', d)}" diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index 4526006cfe..37ae1a00e0 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -13,9 +13,7 @@ EXTRA_IMAGECMD_h2200_jffs2 = "--pad --no-cleanmarkers --pagesize=512 --erasebloc ROOT_FLASH_SIZE = "32" -BOOTSTRAP_EXTRA_DEPENDS_append = " h2200-bootloader handhelds-pxa-2.6 udev module-init-tools" - -BOOTSTRAP_EXTRA_RRECOMMENDS = " ${@linux_module_packages('${H2200_MODULES}', d)}" +BOOTSTRAP_EXTRA_RRECOMMENDS += " ${@linux_module_packages('${H2200_MODULES}', d)}" BOOTSTRAP_EXTRA_RDEPENDS_append = " h2200-bootloader kernel udev module-init-tools" #ship in rootfs: diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf index 96651aa6ae..b364758428 100644 --- a/conf/machine/h3600.conf +++ b/conf/machine/h3600.conf @@ -7,7 +7,6 @@ IPKG_ARCHS = "all arm ipaqsa h3600" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa" EXTRA_IMAGECMD_h3600_jffs2 = "-e 0x40000 -p" -BOOTSTRAP_EXTRA_DEPENDS = "alsa-driver handhelds-sa ipaq-boot-params" BOOTSTRAP_EXTRA_RDEPENDS = "alsa-driver kernel ipaq-boot-params ${@linux_module_packages('${H3600_MODULES}', d)}" ROOT_FLASH_SIZE = "16" diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index a047761598..238f6ad17a 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -16,10 +16,6 @@ EXTRA_IMAGECMD_h3900_jffs2 = "-e 0x40000 -p" ROOT_FLASH_SIZE = "32" -BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params" -BOOTSTRAP_EXTRA_DEPENDS_append_kernel24 = " handhelds-pxa at76c503a-modules" -BOOTSTRAP_EXTRA_DEPENDS_append_kernel26 = " handhelds-pxa-2.6 udev module-init-tools" - BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${H3900_MODULES}', d)}" BOOTSTRAP_EXTRA_RDEPENDS_append_kernel24 = " at76c503a-modules" BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools" diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf index 85a6d36950..2335f5b913 100644 --- a/conf/machine/h6300.conf +++ b/conf/machine/h6300.conf @@ -10,7 +10,6 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-h6300-omap1" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -BOOTSTRAP_EXTRA_DEPENDS = "udev virtual/kernel sysfsutils console-tools modutils-collateral module-init-tools nano minicom gdb" BOOTSTRAP_EXTRA_RDEPENDS = "udev kernel kernel-modules sysfsutils console-tools modutils-collateral module-init-tools nano minicom gdb" H6300_MODULES = "fat vfat nfs \ @@ -18,7 +17,6 @@ bluetooth rfcomm bnep l2cap hci_uart \ irda irlan irtty ircomm ircomm-tty \ omapts" -BOOTSTRAP_EXTRA_DEPENDS += "apmd wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap network-suspend-scripts" BOOTSTRAP_EXTRA_RDEPENDS += "apm apmd network-suspend-scripts" BOOTSTRAP_EXTRA_RRECOMMENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap ${@linux_module_packages('${H6300_MODULES}', d)}" diff --git a/conf/machine/include/handheld-common.conf b/conf/machine/include/handheld-common.conf index 40fd9780f9..467d5e59f1 100644 --- a/conf/machine/include/handheld-common.conf +++ b/conf/machine/include/handheld-common.conf @@ -19,7 +19,6 @@ input uinput \ PCMCIA_MANAGER ?= "pcmcia-cs" # Configuration bits for "generic handheld" -BOOTSTRAP_EXTRA_DEPENDS += "${PCMCIA_MANAGER} apmd ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin network-suspend-scripts" BOOTSTRAP_EXTRA_RDEPENDS += "${PCMCIA_MANAGER} apm apmd network-suspend-scripts" BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}" diff --git a/conf/machine/include/ipaq-common.conf b/conf/machine/include/ipaq-common.conf index 791abd2103..eb696cf9f9 100644 --- a/conf/machine/include/ipaq-common.conf +++ b/conf/machine/include/ipaq-common.conf @@ -1,7 +1,5 @@ IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd atmelwlandriver sa1100-rtc ipaq-hal h3600_ts usb-eth wavelan_cs keybdev" -BOOTSTRAP_EXTRA_DEPENDS += "kbdd bl hostap-modules orinoco-modules atmelwlandriver" -BOOTSTRAP_EXTRA_DEPENDS_append_kernel24 += "mipv6" BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs atmelwlandriver ${@linux_module_packages('${IPAQ_MODULES}', d)}" BOOTSTRAP_EXTRA_RRECOMMENDS_append_kernel24 += "mipv6" diff --git a/conf/machine/include/poodle-2.4.conf b/conf/machine/include/poodle-2.4.conf index dc603d3bcc..5453fda605 100644 --- a/conf/machine/include/poodle-2.4.conf +++ b/conf/machine/include/poodle-2.4.conf @@ -3,10 +3,6 @@ PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" # Later versions are broken on kernel 2.4 PREFERRED_VERSION_orinoco-modules = "0.13e" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel \ -hostap-modules orinoco-modules sharp-sdmmc-support \ -hostap-utils prism3-firmware prism3-support" - BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules orinoco-modules-cs sharp-sdmmc-support \ kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \ kernel-module-usbdcore kernel-module-usbdmonitor \ diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf index 7edebad2d3..885bf40b4f 100644 --- a/conf/machine/include/poodle-2.6.conf +++ b/conf/machine/include/poodle-2.6.conf @@ -1,5 +1,4 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils modutils-collateral hostap-modules orinoco-modules" BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs udev-utils" diff --git a/conf/machine/include/thinclient-common.conf b/conf/machine/include/thinclient-common.conf index e6c97886c9..4a96b42525 100644 --- a/conf/machine/include/thinclient-common.conf +++ b/conf/machine/include/thinclient-common.conf @@ -13,7 +13,6 @@ input uinput \ " # Configuration bits for "generic thinclient" -BOOTSTRAP_EXTRA_DEPENDS += "apmd ppp bluez-utils wireless-tools" BOOTSTRAP_EXTRA_RDEPENDS += "apm" BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp bluez-utils wireless-tools ${@linux_module_packages('${THINCLIENT_MODULES}', d)}" diff --git a/conf/machine/include/tosa-2.4.conf b/conf/machine/include/tosa-2.4.conf index 6e208f4fc6..88df07cddb 100644 --- a/conf/machine/include/tosa-2.4.conf +++ b/conf/machine/include/tosa-2.4.conf @@ -4,9 +4,6 @@ PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" # Later versions are broken on kernel 2.4 PREFERRED_VERSION_orinoco-modules = "0.13e" -BOOTSTRAP_EXTRA_DEPENDS += "wlan-ng-modules wlan-ng-utils virtual/kernel hostap-modules \ - orinoco-modules sharp-sdmmc-support usbutils console-tools" - BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils console-tools \ kernel-module-acm \ kernel-module-evdev kernel-module-net-fd \ diff --git a/conf/machine/include/zaurus-clamshell-2.4.conf b/conf/machine/include/zaurus-clamshell-2.4.conf index d61dc197b2..184258c8b6 100644 --- a/conf/machine/include/zaurus-clamshell-2.4.conf +++ b/conf/machine/include/zaurus-clamshell-2.4.conf @@ -9,10 +9,6 @@ PREFERRED_PROVIDERS_append_borzoi = " virtual/kernel:openzaurus-pxa27x" # Later versions are broken on kernel 2.4 PREFERRED_VERSION_orinoco-modules = "0.13e" -BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support \ -pcmcia-cs apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \ -wpa-supplicant-nossl ppp ppp-dialin openswan" - BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \ pcmcia-cs apmd apm wireless-tools console-tools irda-utils hostap-utils prism3-firmware prism3-support \ wpa-supplicant-nossl ppp ppp-dialin openswan" diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf index 757fc6acf3..e89183b204 100644 --- a/conf/machine/include/zaurus-clamshell-2.6.conf +++ b/conf/machine/include/zaurus-clamshell-2.6.conf @@ -3,10 +3,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" -BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel udev sysfsutils spectrum-fw orinoco-conf \ -pcmcia-cs apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \ -ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils module-init-tools alsa-lib" - BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \ pcmcia-cs apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \ ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf" diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf index e0a26f3dc7..e4d7616510 100644 --- a/conf/machine/include/zaurus-clamshell.conf +++ b/conf/machine/include/zaurus-clamshell.conf @@ -4,15 +4,13 @@ IPKG_ARCHS = "all arm armv4 armv5te c7x0" PREFERRED_PROVIDER_xserver = "xserver-kdrive" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n" -EXTRA_IMAGEDEPENDS = "sharp-flash-header-c700" +EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700 zaurus-updater" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ --output=${T}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}; \ cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img" -BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater" - GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_DEPENDS += "gaim sylpheed chkhinge" GPE_EXTRA_INSTALL += "gaim sylpheed chkhinge" diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index 33c8ad8aa5..e502a12dc2 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -9,9 +9,6 @@ PREFERRED_VERSIONS_handhelds-pxa-2.6 = "2.6.12-hh3" PREFERRED_VERSION_orinoco-modules = "0.15rc1" -BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params" -BOOTSTRAP_EXTRA_DEPENDS_append = " handhelds-pxa-2.6 udev module-init-tools" - ROOT_FLASH_SIZE = "80" BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${PXA270_MODULES}', d)}" diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf index 9de9eaba89..b3f54995c8 100644 --- a/conf/machine/jornada56x.conf +++ b/conf/machine/jornada56x.conf @@ -7,7 +7,6 @@ IPKG_ARCHS = "all arm ${MACHINE}" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa-2.6" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel" BOOTSTRAP_EXTRA_RDEPENDS = "kernel kernel-modules module-init-tools" EXTRA_IMAGECMD_jornada56x_jffs2 = "-e 0x40000 -p" diff --git a/conf/machine/mainstone.conf b/conf/machine/mainstone.conf index 2de75e020d..ff899f44e1 100644 --- a/conf/machine/mainstone.conf +++ b/conf/machine/mainstone.conf @@ -9,8 +9,6 @@ IPKG_ARCHS = "all arm armv5te ${MACHINE}" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" -BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel" - include conf/machine/include/tune-xscale.conf # used by sysvinit_2 diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf index 30223a485d..abcf9d2de7 100644 --- a/conf/machine/netvista.conf +++ b/conf/machine/netvista.conf @@ -6,7 +6,6 @@ TARGET_ARCH = "i386" IPKG_ARCHS = "all i386" PREFERRED_PROVIDER_xserver = "xserver-xorg" PREFERRED_PROVIDER_virtual/kernel = "linux-netvista" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils module-init-tools strace" BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils" #BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules" #IMAGE_FSTYPE = "cramfs" @@ -20,7 +19,6 @@ GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser abiword" GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser abiword" -#BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev module-init-tools strace" #BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev module-init-tools kernel-modules strace #udevdir = "/dev" diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf index d023342ebb..7b9a24ba0c 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -30,9 +30,6 @@ SERIAL_CONSOLE = "115200 ttyS0" #build omap1 till nokia releases the patches PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" -BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel sysfsutils nokia770-init \ -pcmcia-cs apmd ppp wireless-tools console-tools openswan wpa-supplicant-nossl lrzsz ppp-dialin" - BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils nokia770-init \ pcmcia-cs apm ppp wireless-tools console-tools" diff --git a/conf/machine/omap1510inn.conf b/conf/machine/omap1510inn.conf index 13792630a6..9c460b44b8 100644 --- a/conf/machine/omap1510inn.conf +++ b/conf/machine/omap1510inn.conf @@ -9,7 +9,6 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel modutils-collateral" BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" diff --git a/conf/machine/omap1610h2.conf b/conf/machine/omap1610h2.conf index 13792630a6..9c460b44b8 100644 --- a/conf/machine/omap1610h2.conf +++ b/conf/machine/omap1610h2.conf @@ -9,7 +9,6 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel modutils-collateral" BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" diff --git a/conf/machine/omap1710h3.conf b/conf/machine/omap1710h3.conf index 13792630a6..9c460b44b8 100644 --- a/conf/machine/omap1710h3.conf +++ b/conf/machine/omap1710h3.conf @@ -9,7 +9,6 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel modutils-collateral" BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" diff --git a/conf/machine/omap2420h4.conf b/conf/machine/omap2420h4.conf index 19ddc39430..db333b2e19 100644 --- a/conf/machine/omap2420h4.conf +++ b/conf/machine/omap2420h4.conf @@ -9,7 +9,6 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel modutils-collateral" BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf index a5a0fe88f2..822d766a98 100644 --- a/conf/machine/omap5912osk.conf +++ b/conf/machine/omap5912osk.conf @@ -9,7 +9,6 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" -BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel modutils-collateral" BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" SERIAL_CONSOLE ?= "115200 ttyS0" diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf index dc83aa153d..a1bf5fbec3 100644 --- a/conf/machine/poodle.conf +++ b/conf/machine/poodle.conf @@ -12,7 +12,7 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}" -BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater" +EXTRA_IMAGEDEPENDS += "zaurus-updater" include conf/machine/include/handheld-common.conf diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf index edb18894cb..30444c1533 100644 --- a/conf/machine/simpad.conf +++ b/conf/machine/simpad.conf @@ -17,11 +17,6 @@ PREFERRED_PROVIDERS_kernel26 += "virtual/${TARGET_PREFIX}depmod-2.6:module-init- # Later versions are broken on kernel 2.4 PREFERRED_VERSION_orinoco-modules_kernel24 = "0.13e" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules" -BOOTSTRAP_EXTRA_DEPENDS_append_kernel24 += "pcmcia-cs apmd hostap-utils \ -wpa-supplicant-nossl" -BOOTSTRAP_EXTRA_DEPENDS_append_kernel26 += "udev module-init-tools" - BOOTSTRAP_EXTRA_RDEPENDS = "kernel" BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 += "udev module-init-tools" BOOTSTRAP_EXTRA_RDEPENDS_append_kernel24 += "hostap-modules orinoco-modules \ @@ -32,7 +27,6 @@ kernel-module-sa1100-ir kernel-module-sa1100usb-core kernel-module-usb-eth \ kernel-module-pcnet-cs kernel-module-8390" # This is needed for the ramdisk script to work -BOOTSTRAP_EXTRA_DEPENDS += "e2fsprogs" BOOTSTRAP_EXTRA_RDEPENDS += "e2fsprogs-mke2fs" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n" diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index 171d23f8dc..e1cb468d8f 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -7,12 +7,10 @@ KERNEL_VERSION ?= "2.6" include conf/machine/include/zaurus-clamshell.conf include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf -PIVOTBOOT_EXTRA_DEPENDS += "pivotinit pcmcia-cs" PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit pcmcia-cs" PIVOTBOOT_EXTRA_RRECOMMENDS += "" # Useful things for the built-in Harddisk -BOOTSTRAP_EXTRA_DEPENDS += "hdparm e2fsprogs" BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs" IMAGE_FSTYPES = "jffs2 tar.gz" @@ -20,4 +18,3 @@ IMAGE_FSTYPES = "jffs2 tar.gz" ROOT_FLASH_SIZE = "100" # actually that should really read ROOTFS_SIZE = "100", because with modern kernels, # we boot from the built-in harddisk in C3000. ROOT_FLASH_SIZE is really 5 MegaByte - diff --git a/conf/machine/sun4cdm.conf b/conf/machine/sun4cdm.conf index ee3f34dc34..d73ab85f87 100644 --- a/conf/machine/sun4cdm.conf +++ b/conf/machine/sun4cdm.conf @@ -2,7 +2,6 @@ TARGET_ARCH = "sparc" IMAGE_FSTYPE = "cramfs" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel module-init-tools udev" BOOTSTRAP_EXTRA_RDEPENDS = "kernel module-init-tools udev" udevdir = "/dev" diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index 3f39cb7c19..a4bdba8675 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -12,7 +12,7 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}" -BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater" +EXTRA_IMAGEDEPENDS += "zaurus-updater" GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_DEPENDS += "gaim" diff --git a/conf/machine/triton.conf b/conf/machine/triton.conf index 9817545a51..cb5c8fb9cd 100644 --- a/conf/machine/triton.conf +++ b/conf/machine/triton.conf @@ -6,7 +6,6 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm armv5te ${MACHINE}" PREFERRED_PROVIDER_virtual/kernel = "triton-kernel" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel" BOOTSTRAP_EXTRA_RDEPENDS = "virtual/kernel" EXTRA_IMAGECMD_jffs2 = "--pad=0x1dc0000 --little-endian --eraseblock=0x40000 -n" diff --git a/conf/machine/wrt54.conf b/conf/machine/wrt54.conf index 2d6e0f9d17..569d78b5a0 100644 --- a/conf/machine/wrt54.conf +++ b/conf/machine/wrt54.conf @@ -8,7 +8,8 @@ IPKG_ARCHS = "all mipsel ${MACHINE}" SERIAL_CONSOLE = "tts/0" -BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel wrt-utils wrt-init loader" +#FIXME loader should perhaps be an EXTRA_IMAGEDEPENDS? +#BOOTSTRAP_EXTRA_DEPENDS += "loader" BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wl kernel-module-et kernel-module-wlcompat kernel-module-diag" BOOTSTRAP_EXTRA_RDEPENDS += "wrt-init wrt-utils" BOOTSTRAP_EXTRA_RRECOMMENDS += "" diff --git a/conf/machine/x86.conf b/conf/machine/x86.conf index 4c5359e3c4..02583c9fae 100644 --- a/conf/machine/x86.conf +++ b/conf/machine/x86.conf @@ -6,7 +6,6 @@ TARGET_ARCH = "i386" # TARGET_VENDOR = "-oe" IPKG_ARCHS = "all i386 x86" PREFERRED_PROVIDER_virtual/kernel = "linux-x86" -BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev" BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules" udevdir = "/dev" |