]> git.openpandora.org Git - openembedded.git/commitdiff
Following from the meta/packages changes, cleanup conf/machine for incorrect DEPENDS...
authorRichard Purdie <rpurdie@rpsys.net>
Sun, 8 Jan 2006 14:56:12 +0000 (14:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 8 Jan 2006 14:56:12 +0000 (14:56 +0000)
48 files changed:
classes/package_ipk.bbclass
conf/bitbake.conf
conf/distro/familiar.conf
conf/distro/jlime-shrek.conf
conf/distro/openomap.conf
conf/machine/blueangel.conf
conf/machine/borzoi.conf
conf/machine/colinux.conf
conf/machine/collie.conf
conf/machine/devkitidp-pxa255.conf
conf/machine/epia.conf
conf/machine/geodegx.conf
conf/machine/h1910.conf
conf/machine/h1940.conf
conf/machine/h2200.conf
conf/machine/h3600.conf
conf/machine/h3900.conf
conf/machine/h6300.conf
conf/machine/include/handheld-common.conf
conf/machine/include/ipaq-common.conf
conf/machine/include/poodle-2.4.conf
conf/machine/include/poodle-2.6.conf
conf/machine/include/thinclient-common.conf
conf/machine/include/tosa-2.4.conf
conf/machine/include/zaurus-clamshell-2.4.conf
conf/machine/include/zaurus-clamshell-2.6.conf
conf/machine/include/zaurus-clamshell.conf
conf/machine/ipaq-pxa270.conf
conf/machine/jornada56x.conf
conf/machine/mainstone.conf
conf/machine/netvista.conf
conf/machine/nokia770.conf
conf/machine/omap1510inn.conf
conf/machine/omap1610h2.conf
conf/machine/omap1710h3.conf
conf/machine/omap2420h4.conf
conf/machine/omap5912osk.conf
conf/machine/poodle.conf
conf/machine/simpad.conf
conf/machine/spitz.conf
conf/machine/sun4cdm.conf
conf/machine/tosa.conf
conf/machine/triton.conf
conf/machine/wrt54.conf
conf/machine/x86.conf
packages/meta/nylon-image-base.bb
packages/meta/nylon-image-mini.bb
packages/zaurus-updater/zaurus-updater.bb

index 6d3e1eb686bd65cfcf735a7d91d1a7170b3b4aec..a70b1e8cddafa8484e04b64d7d922a6221137b04 100644 (file)
@@ -1,7 +1,6 @@
 inherit package
 DEPENDS_prepend="${@["ipkg-utils-native ", ""][(bb.data.getVar('PACKAGES', d, 1) == '')]}"
 BOOTSTRAP_EXTRA_RDEPENDS += "ipkg-collateral ipkg ipkg-link"
-BOOTSTRAP_EXTRA_DEPENDS  += "ipkg-collateral ipkg ipkg-link"
 PACKAGEFUNCS += "do_package_ipk"
 
 python package_ipk_fn () {
index 61c08758b21e3d9eb9c8b64bfe41ed76b7b6aa21..98d188375f1176c5f8052ef82a4773aacd828865 100644 (file)
@@ -276,7 +276,6 @@ BUILD_OPTIMIZATION = "-O2"
 # Bootstrap stuff.
 ##################################################################
 
-BOOTSTRAP_EXTRA_DEPENDS = ""
 BOOTSTRAP_EXTRA_RDEPENDS = ""
 BOOTSTRAP_EXTRA_RRECOMMENDS = ""
 
index 0b31c3c5a3a11430d902b2aa7dbaff05bc9bbda3..9cc84e96c42a8246acd29a7f44483d50c3b39f90 100644 (file)
@@ -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')}"
index 2dd964113778f43474d1a5cc18aae59fd6ac8c0f..c3f88c5511711c27a010897d955afa3cd34687a4 100644 (file)
@@ -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             \
index 6f0bca934208680409889ee994e252db28dafe8c..192400b9a18eaa7888fb2192fc9045e5bbf3a755 100644 (file)
@@ -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"
index 196cd51ebb6e48ab3447008ec1069f5d52610f8b..3f90ccf84c9ca58c47f24929b5163c064943e1ee 100644 (file)
@@ -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"
 
index 83899514f5fdc09f2adcabe34361a20be4cc5996..185c9f02cb4f71510d693cc80d2ab432bcc173e2 100644 (file)
@@ -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"
index 8c66aa1ab45247d19aefd950d9b69aac1a110ab2..1af280c2b3dd2b267f017a1c823e9200571ae26b 100644 (file)
@@ -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"
index a8226ea04e8ecb272227070ff67a8d96cd1e2e57..3e95848a3507d0878e3ecf2c4d73a22220a68572 100644 (file)
@@ -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"
index 329ac6816d5c4ab5990bf9c6000ad529fa45489f..39ef40ae1668b4885afae171ec9999c5988e5c77 100644 (file)
@@ -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
 
index 29631314862b9cdc6011814e1fcd79b86146269c..0d3bcedee355b7b8875098612e874fa86daf79be 100644 (file)
@@ -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"
index 23a08cc99d9fba088edeb319f5b066a366499e9b..e4f56f16e3402fda8c70b7c0f8f592309aa243d3 100644 (file)
@@ -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"
index 0c602398c78d74201c6bed82d48c379d8685f9b5..7ebcccb293c0a7f6478079f222bfe3c93e904e6b 100644 (file)
@@ -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 += ""
 
index 570dc3be1e69a475fbd198d8b87445e7aed8d652..fb4dc8c7108ac776bce4f45b4329a8c9118976b1 100644 (file)
@@ -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)}"
 
index 4526006cfee9598f55f558e9eace178b0ec98b61..37ae1a00e0de114d1786341bb30f76a22c00ae85 100644 (file)
@@ -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:
index 96651aa6ae940cf3732d1883469890b1d0903473..b364758428df5d047cc24a8323cafce4d62ea7a4 100644 (file)
@@ -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"
index a047761598ffe7b20fe9214033e829db2618007f..238f6ad17abf4dc4bbc16e2287346d828196ebd8 100644 (file)
@@ -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"
index 85a6d36950054e7ba325a25d729ce6ad526ba2c9..2335f5b91336b6ce11d601838a225ffca925f41c 100644 (file)
@@ -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)}"
 
index 40fd9780f9f5478365e7f1c41fa32b4757311198..467d5e59f19604ae0e2b3f0b5271e6d790b37ccb 100644 (file)
@@ -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)}"
 
index 791abd210318d5d0e9d3e0daad53fce30d4d4046..eb696cf9f9bbcc640429152fa9d511fdb628df1f 100644 (file)
@@ -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"
 
index dc603d3bcc457eeb9d70922d0f7ffe421dcbb448..5453fda605fc8577d605488e31b76d3d2184a0ae 100644 (file)
@@ -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 \
index 7edebad2d35cd1dfc922d5de5b1dd125f0fb1f2b..885bf40b4fc90c27b2caf7988edd9ed56a9b0464 100644 (file)
@@ -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"
 
index e6c97886c91d964cd59821a89a4d73e9e586129e..4a96b42525b686998ea4d494ad45f6d5f305fa09 100644 (file)
@@ -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)}"
 
index 6e208f4fc6ba675c92a10314e432f7b7c125c21d..88df07cddb022608350edcff8a11b11816ab099b 100644 (file)
@@ -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 \
index d61dc197b2d0629e59a0e33e33571b9a8c7f4598..184258c8b6602cdb379243a9c663a72d6d6b014a 100644 (file)
@@ -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"
index 757fc6acf3071cfe47d1da5ac45ffcb9138ab31c..e89183b2043a9bba37c7d8c3f8b127b66b541b16 100644 (file)
@@ -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"
index e0a26f3dc753a0a231711f901d15d190d131b1d6..e4d76165106f88ca52aadf5bccffb2004e84eee3 100644 (file)
@@ -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"
index 33c8ad8aa549901a15478c1b4b044fa076f20b58..e502a12dc2e10e6ac26dca1b2b1cbfcb666369c8 100644 (file)
@@ -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)}"
index 9de9eaba896b45dc9b4668ab8e7c729ff18da755..b3f54995c8deac37e05492bbf4c5d1a1284f7767 100644 (file)
@@ -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"
index 2de75e020dbea67a8ba21d1d94a730332aaac2d6..ff899f44e1db1620615438e730f2379e563cd191 100644 (file)
@@ -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
index 30223a485df30315119d6cd81ec9418cf4a0833f..abcf9d2de76654256703a4b3ab0dd509268b69dc 100644 (file)
@@ -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"
 
index d023342ebb1d78c750ea57b4fe9705a6b7bc93df..7b9a24ba0c06a026c35c809dc1c1241897a1cbfd 100644 (file)
@@ -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"
 
index 13792630a6f871b3b16b5add805d8863272c712b..9c460b44b8b6854e559a30d4a3a33e2d552a7789 100644 (file)
@@ -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"
index 13792630a6f871b3b16b5add805d8863272c712b..9c460b44b8b6854e559a30d4a3a33e2d552a7789 100644 (file)
@@ -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"
index 13792630a6f871b3b16b5add805d8863272c712b..9c460b44b8b6854e559a30d4a3a33e2d552a7789 100644 (file)
@@ -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"
index 19ddc394301a949f11a7a1ad729add762996ce08..db333b2e19671a0a54449a3ae3987a7d9e653cfc 100644 (file)
@@ -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"
index a5a0fe88f248e60d14f6f81cb7f31f048dc7d0cd..822d766a9879a800e6a1ff0b2408df3ddd531238 100644 (file)
@@ -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"
index dc83aa153d2a435f6ebd77d26627c3925c622ef6..a1bf5fbec3ad165537cad857a12252209a188559 100644 (file)
@@ -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
 
index edb18894cb3692980e757b819ba819eae502eaee..30444c1533a7a0173e1ad2fff54a808b06090226 100644 (file)
@@ -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"
index 171d23f8dc9a7905072491b37fdf8b0a2db67d98..e1cb468d8f92119f04026f08d6cd845f59329db0 100644 (file)
@@ -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
-
index ee3f34dc3471a19c59e088970a56176847982a0c..d73ab85f877820f90ca18e09b70dd11ec16ce9b3 100644 (file)
@@ -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"
index 3f39cb7c19f8770ead4763fe15b7dc021c0c2dce..a4bdba86753e4212be9fe36b3002494b6df7d5f9 100644 (file)
@@ -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"
index 9817545a51fccc4870bc2943e2b4745f94850830..cb5c8fb9cda8352329e4c180a22f5652487410f3 100644 (file)
@@ -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"
index 2d6e0f9d17f9254c6b7f74253ce444bd2c2f8887..569d78b5a0a22c3f7a917af11c859b47ce7b535e 100644 (file)
@@ -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 += ""
index 4c5359e3c40aeb85b6145d7a012f7a5b0ec41c7c..02583c9fae8bfb7356e989021126436fe82dfc0c 100644 (file)
@@ -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"
index b706bca2d59837f1cdcb116d9404c70f5d9195de..ce6c83d84786453226966c45d231e578fd3e8d09 100644 (file)
@@ -6,9 +6,6 @@ NYLON_BASE = "base-files base-passwd bash busybox \
        nano ncurses netbase \
        openssh sysvinit \
        timezones tinylogin"
-
-DEPENDS = "virtual/kernel \
-       ${NYLON_BASE} ${BOOTSTRAP_EXTRA_DEPENDS}"
        
 RDEPENDS = "kernel modutils-depmod modutils-modinfo \
        ${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS}"
index be61193c480033c8fb088d73ff404f284794dcc3..e3ac80720d9d32a653884b0c7724b063f831d81e 100644 (file)
@@ -8,9 +8,6 @@ NYLON_BASE = "base-files base-passwd busybox \
        netbase \
        wireless-tools"
 
-DEPENDS = "virtual/kernel modutils \
-       ${NYLON_BASE} ${BOOTSTRAP_EXTRA_DEPENDS}"
-       
 RDEPENDS = "kernel \
        ${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS}"
 
index 7707e48eeb64f8207958d73625546c2856e8cec7..7bed78e9bc33a94b62b4f6ffe9d74ec1678e93eb 100644 (file)
@@ -3,6 +3,8 @@ DEPENDS = "encdec-updater-native"
 LICENSE = "zaurus-updater"
 PR = "r2"
 
+PACKAGES = ""
+
 SRC_URI = "file://updater.sh \
            file://gnu-tar.gz"
 S = "${WORKDIR}"