diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2006-01-09 19:21:24 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-09 19:21:24 +0000 |
| commit | 86d1d8cd13335c4dca722ac398c69a105fc9ac8f (patch) | |
| tree | bf7433f99e0fc0ffbdbddd24c2201d21a9dd60e8 /conf | |
| parent | 249a5476b2d2ec15e71b126bb02bc885b29604ee (diff) | |
| parent | 45e1048fb2a2fc047c8a903966ca5cc9d1e03112 (diff) | |
explicit_merge of '93b8d4a095a60dfe2b4b6e82f4ce68721a1d4f11'
and 'd5130c6d17c31fa91dee51b0074c7e5e8c87717c'
using ancestor ''
to branch 'org.openembedded.dev'
Diffstat (limited to 'conf')
77 files changed, 119 insertions, 181 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 06d9e61ac5..98d188375f 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -67,6 +67,12 @@ TIME := "${@time.strftime('%H%M%S',time.gmtime())}" DATETIME = "${DATE}${TIME}" ################################################################## +# Openembedded Software Prerequisites. +################################################################## + +ASSUME_PROVIDED = "python-native cvs-native svn-native" + +################################################################## # Package default variables. ################################################################## @@ -270,7 +276,6 @@ BUILD_OPTIMIZATION = "-O2" # Bootstrap stuff. ################################################################## -BOOTSTRAP_EXTRA_DEPENDS = "" BOOTSTRAP_EXTRA_RDEPENDS = "" BOOTSTRAP_EXTRA_RRECOMMENDS = "" @@ -309,7 +314,7 @@ RESUMECOMMAND = "" RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 --passive-ftp -P ${DL_DIR} ${URI}" UPDATECOMMAND = "" UPDATECOMMAND_cvs = "/usr/bin/env cvs update -d -P ${CVSCOOPTS}" -CVSDATE = "${DATE}" +SRCDATE = "${DATE}" SRC_URI = "file://${FILE}" diff --git a/conf/distro/familiar-unstable.conf b/conf/distro/familiar-unstable.conf index 90745ebe2d..1a5600c986 100644 --- a/conf/distro/familiar-unstable.conf +++ b/conf/distro/familiar-unstable.conf @@ -14,8 +14,8 @@ FEED_URIS += " \ base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates" -#CVSDATE = 20050331 -#CVSDATE = "now" +#SRCDATE = 20050331 +#SRCDATE = "now" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" diff --git a/conf/distro/familiar.conf b/conf/distro/familiar.conf index 98807d63ab..9cc84e96c4 100644 --- a/conf/distro/familiar.conf +++ b/conf/distro/familiar.conf @@ -8,7 +8,8 @@ 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')}" + +include conf/distro/include/multimachine.conf
\ No newline at end of file diff --git a/conf/distro/include/.mtn2git_empty b/conf/distro/include/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/conf/distro/include/.mtn2git_empty diff --git a/conf/distro/include/multimachine.conf b/conf/distro/include/multimachine.conf new file mode 100644 index 0000000000..1f73ffd30f --- /dev/null +++ b/conf/distro/include/multimachine.conf @@ -0,0 +1,3 @@ +STAMP = "${TMPDIR}/stamps/${PACKAGE_ARCH}-${HOST_OS}/${PF}" +WORKDIR = "${TMPDIR}/work/${PACKAGE_ARCH}-${HOST_OS}/${PF}" +STAGING_KERNEL_DIR = "${STAGING_DIR}/${PACKAGE_ARCH}-${HOST_OS}/kernel" diff --git a/conf/distro/jlime-shrek.conf b/conf/distro/jlime-shrek.conf index e25c7e64de..c3f88c5511 100644 --- a/conf/distro/jlime-shrek.conf +++ b/conf/distro/jlime-shrek.conf @@ -10,7 +10,7 @@ DISTRO_TYPE = "release" export FEED_URLS_jlime = "shrek##http://www.jlime.com/downloads/releases/shrek/${TARGET_ARCH}/feed/" -CVSDATE = 20050518 +SRCDATE = 20050518 PREFERRED_PROVIDERS = "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" @@ -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/maemo-1.0.conf b/conf/distro/maemo-1.0.conf index 15ec45f34e..f83e4b1d96 100644 --- a/conf/distro/maemo-1.0.conf +++ b/conf/distro/maemo-1.0.conf @@ -11,7 +11,7 @@ FEED_URIS += " \ base##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/base \ updates##http://familiar.handhelds.org/releases/${DISTRO_VERSION}/feed/updates" -#CVSDATE = 20050331 +#SRCDATE = 20050331 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf index 77d14dc518..c7fcb83610 100644 --- a/conf/distro/nylon.conf +++ b/conf/distro/nylon.conf @@ -19,7 +19,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc" -#CVSDATE = 20040916 +#SRCDATE = 20040916 PREFERRED_VERSION_glibc = "2.3.3" PREFERRED_VERSION_gcc-cross-initial = "3.3.4" 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/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf index 2e4a943337..009f9c9290 100644 --- a/conf/distro/openzaurus-unstable.conf +++ b/conf/distro/openzaurus-unstable.conf @@ -14,7 +14,7 @@ DISTRO_TYPE = "debug" # console##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/console \ # devel##http://openzaurus.org/official/unstable/${DISTRO_VERSION}/feed/devel" -# CVSDATE = "20050704" +# SRCDATE = "20050704" # # Zaurus diff --git a/conf/distro/openzaurus.conf b/conf/distro/openzaurus.conf index 1a4fc7c3f8..b110ad84e9 100644 --- a/conf/distro/openzaurus.conf +++ b/conf/distro/openzaurus.conf @@ -14,3 +14,5 @@ TARGET_FPU = "soft" PARALLEL_INSTALL_MODULES = "1" 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')}" + +include conf/distro/include/multimachine.conf
\ No newline at end of file diff --git a/conf/distro/preferred-gpe-versions-2.6.inc b/conf/distro/preferred-gpe-versions-2.6.inc index 98c1a969fa..d4422e86e9 100644 --- a/conf/distro/preferred-gpe-versions-2.6.inc +++ b/conf/distro/preferred-gpe-versions-2.6.inc @@ -3,10 +3,10 @@ # #work around some breakages -CVSDATE_xserver-kdrive=20050207 -CVSDATE_minimo=20050401 -CVSDATE_cairo=20050330 -CVSDATE_xext=20050222 +SRCDATE_xserver-kdrive=20050207 +SRCDATE_minimo=20050401 +SRCDATE_cairo=20050330 +SRCDATE_xext=20050222 #set some preferred providers: PREFERRED_PROVIDER_gconf=gconf-dbus @@ -32,10 +32,10 @@ PREFERRED_VERSION_xcursor-transparent-theme ?= "0.1.1" PREFERRED_VERSION_rxvt-unicode ?= "5.3" PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" PREFERRED_VERSION_xst ?= "0.14" -#PREFERRED_VERSION_xextensions ?= "0.0cvs${CVSDATE}" -PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" -PREFERRED_VERSION_xhost ?= "0.0cvs20040413" -PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}" +#PREFERRED_VERSION_xextensions ?= "0.0+cvs${SRCDATE}" +PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" +PREFERRED_VERSION_xhost ?= "0.0+cvs20040413" +PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_gpe-login ?= "0.76" PREFERRED_VERSION_gpe-session-scripts ?= "0.62" PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" @@ -77,9 +77,9 @@ PREFERRED_VERSION_gpe-tetris ?= "0.6-2" PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6" PREFERRED_VERSION_xdemineur ?= "2.1.1" PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1" -PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}" +PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_dillo2 ?= "0.6.6" -PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}" +PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE_minimo}" PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1" PREFERRED_VERSION_linphone ?= "0.12.2" PREFERRED_VERSION_firefox ?= "1.0" diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc index 9f2c041839..59567312ad 100644 --- a/conf/distro/preferred-gpe-versions-2.7.inc +++ b/conf/distro/preferred-gpe-versions-2.7.inc @@ -3,7 +3,7 @@ # #work around some breakages -#CVSDATE_minimo=20050401 +#SRCDATE_minimo=20050401 #set some preferred providers: PREFERRED_PROVIDER_gconf=gconf-dbus @@ -14,7 +14,7 @@ PREFERRED_VERSION_libmatchbox ?= "1.7" PREFERRED_VERSION_matchbox ?= "0.9.1" PREFERRED_VERSION_matchbox-common ?= "0.9.1" PREFERRED_VERSION_matchbox-desktop ?= "0.9.1" -PREFERRED_VERSION_matchbox-wm ?= "0.9.5+cvs-${CVSDATE}" +PREFERRED_VERSION_matchbox-wm ?= "0.9.5+cvs${SRCDATE}" PREFERRED_VERSION_matchbox-panel ?= "0.9.2" PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6" PREFERRED_VERSION_atk ?= "1.9.0" @@ -36,10 +36,10 @@ PREFERRED_VERSION_rxvt-unicode ?= "5.6" PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" PREFERRED_VERSION_xst ?= "0.15" PREFERRED_VERSION_xextensions ?= "1.0.1" -PREFERRED_VERSION_xserver-kdrive = "0.0cvs20050207" -PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" -PREFERRED_VERSION_xhost ?= "0.0cvs20040413" -PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}" +PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20050207" +PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" +PREFERRED_VERSION_xhost ?= "0.0+cvs20040413" +PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_gpe-login ?= "0.83" PREFERRED_VERSION_gpe-session-scripts ?= "0.66" PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" @@ -82,13 +82,13 @@ PREFERRED_VERSION_gpe-tetris ?= "0.6-4" PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6" PREFERRED_VERSION_xdemineur ?= "2.1.1" PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1" -PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}" +PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}" PREFERRED_VERSION_dillo2 ?= "0.6.6" -PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}" +PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE_minimo}" PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1" PREFERRED_VERSION_linphone ?= "0.12.2" PREFERRED_VERSION_firefox ?= "1.0" -PREFERRED_VERSION_gaim ?= "2.0.0-cvs-mco1-20050904" +PREFERRED_VERSION_gaim ?= "2.0.0+cvs20050904-mco1" PREFERRED_VERSION_poppler ?= "0.3.3" PREFERRED_VERSION_evince ?= "0.3.2" PREFERRED_VERSION_gpe_mini_browser ?= "0.18" diff --git a/conf/distro/preferred-gpe-versions.inc b/conf/distro/preferred-gpe-versions.inc index b68eb32c2a..676e0ee9f9 100644 --- a/conf/distro/preferred-gpe-versions.inc +++ b/conf/distro/preferred-gpe-versions.inc @@ -3,7 +3,7 @@ # #work around some breakages -#CVSDATE_xext=20050222 +#SRCDATE_xext=20050222 #set some preferred providers: PREFERRED_PROVIDER_gconf=gconf-dbus @@ -31,9 +31,9 @@ PREFERRED_VERSION_rxvt-unicode ?= "5.3" #PREFERRED_VERSION_gtk2-theme-angelistic ?= "0.3" #PREFERRED_VERSION_xst ?= "0.14" PREFERRED_VERSION_xextensions ?= "1.0.1" -PREFERRED_VERSION_xprop ?= "0.0cvs${CVSDATE}" -PREFERRED_VERSION_xhost ?= "0.0cvs20040413" -PREFERRED_VERSION_xrdb ?= "0.0cvs${CVSDATE}" +PREFERRED_VERSION_xprop ?= "0.0+cvs${SRCDATE}" +PREFERRED_VERSION_xhost ?= "0.0+cvs20040413" +PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}" #PREFERRED_VERSION_gpe-login ?= "0.76" #PREFERRED_VERSION_gpe-session-scripts ?= "0.62" #PREFERRED_VERSION_gpe-soundserver ?= "0.4-1" @@ -75,9 +75,9 @@ PREFERRED_VERSION_dbus ?= "0.23.4" #PREFERRED_VERSION_gsoko ?= "0.4.2-gpe6" #PREFERRED_VERSION_xdemineur ?= "2.1.1" #PREFERRED_VERSION_matchbox-panel-hacks ?= "0.3-1" -PREFERRED_VERSION_rosetta ?= "0.0cvs${CVSDATE}" +PREFERRED_VERSION_rosetta ?= "0.0+cvs${SRCDATE}" #PREFERRED_VERSION_dillo2 ?= "0.6.6" -PREFERRED_VERSION_minimo ?= "0.0cvs${CVSDATE_minimo}" +PREFERRED_VERSION_minimo ?= "0.0+cvs${SRCDATE_minimo}" #PREFERRED_VERSION_linphone-hh ?= "0.12.2.hh1" #PREFERRED_VERSION_linphone ?= "0.12.2" #PREFERRED_VERSION_firefox ?= "1.0" diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf index bf07d6b1f0..11bb62a5d1 100644 --- a/conf/distro/sharprom-compatible.conf +++ b/conf/distro/sharprom-compatible.conf @@ -56,7 +56,7 @@ include conf/distro/preferred-opie-versions.inc # GPE # -CVSDATE_xserver-kdrive = "20050208" +SRCDATE_xserver-kdrive = "20050208" PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive" PREFERRED_PROVIDERS += " gst-plugins:gpe-gst-plugins" diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf index cab425a25f..8eb0b01aa8 100644 --- a/conf/distro/slugos.conf +++ b/conf/distro/slugos.conf @@ -170,7 +170,7 @@ PREFERRED_VERSION_ixp400-eth ?= "1.5" # Select the smallest provider of x11 libraries PREFERRED_PROVIDER_x11 ?= "diet-x11" -CVSDATE_diet-x11 ?= "20060106" +SRCDATE_diet-x11 ?= "20060106" # Ensure consistency across all SlugOS builds for the provider of a # relational database - use the latest version of the SleepyCat diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 8515247d40..cbe829c2a1 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -34,11 +34,11 @@ BBMASK = "" # provide packages for toolchain and additional libraries yourself. You also # have to set PATH in your environment to make sure BitBake finds additional binaries. # Note: You will definitely need to say: -# ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95" +# ASSUME_PROVIDED += "virtual/arm-linux-gcc-2.95" # to build any of two Linux 2.4 Embedix kernels, # i.e. openzaurus-sa-2.4.18 and openzaurus-pxa-2.4.18 - and don't forget # to rename the binaries as instructed in the Wiki. -# ASSUME_PROVIDED = "virtual/${TARGET_PREFIX}gcc virtual/libc" +# ASSUME_PROVIDED += "virtual/${TARGET_PREFIX}gcc virtual/libc" # Select between multiple alternative providers, if more than one is eligible. PREFERRED_PROVIDERS = "virtual/qte:qte virtual/libqpe:libqpe-opie" diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf index 6cf622ae1c..da699e7258 100644 --- a/conf/machine/akita.conf +++ b/conf/machine/akita.conf @@ -4,7 +4,7 @@ KERNEL_VERSION ?= "2.6" -include conf/machine/zaurus-clamshell.conf -include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf +include conf/machine/include/zaurus-clamshell.conf +include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf ROOT_FLASH_SIZE = "58" diff --git a/conf/machine/blueangel.conf b/conf/machine/blueangel.conf index ef9bd3419e..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" @@ -26,10 +23,10 @@ SERIAL_CONSOLE = "115200 tts/2 vt100" USE_VT = "0" -include conf/machine/handheld-common.conf +include conf/machine/include/handheld-common.conf GUI_MACHINE_CLASS = "smallscreen" ROOT_FLASH_SIZE = "32" # optimize images, but build feeds without using tune-xscale so as to retain backwards compatibility -include conf/machine/tune-xscale.conf +include conf/machine/include/tune-xscale.conf diff --git a/conf/machine/borzoi.conf b/conf/machine/borzoi.conf index b7bb5a0afe..185c9f02cb 100644 --- a/conf/machine/borzoi.conf +++ b/conf/machine/borzoi.conf @@ -4,15 +4,13 @@ KERNEL_VERSION ?= "2.6" -include conf/machine/zaurus-clamshell.conf -include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf +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/c7x0.conf b/conf/machine/c7x0.conf index 6b8348e117..af1c9dad1c 100644 --- a/conf/machine/c7x0.conf +++ b/conf/machine/c7x0.conf @@ -4,8 +4,8 @@ KERNEL_VERSION ?= "2.6" -include conf/machine/zaurus-clamshell.conf -include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf +include conf/machine/include/zaurus-clamshell.conf +include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf ROOT_FLASH_SIZE = "25" # yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it. 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 4af42deb24..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,15 +14,14 @@ 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" IMAGE_LINGUAS = "" -include conf/machine/handheld-common.conf -include conf/machine/tune-strongarm.conf +include conf/machine/include/handheld-common.conf +include conf/machine/include/tune-strongarm.conf SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/devkitidp-pxa255.conf b/conf/machine/devkitidp-pxa255.conf index ff4a82f95c..39ef40ae16 100644 --- a/conf/machine/devkitidp-pxa255.conf +++ b/conf/machine/devkitidp-pxa255.conf @@ -10,9 +10,9 @@ 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/tune-xscale.conf +include conf/machine/include/tune-xscale.conf # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf index 429242c9bd..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" @@ -10,5 +9,5 @@ GLIBC_ADDONS = "nptl" GLIBC_EXTRA_OECONF = "--with-tls" IPKG_ARCHS = "i386" -include conf/machine/tune-c3.conf +include conf/machine/include/tune-c3.conf 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 468fcf1838..7ebcccb293 100644 --- a/conf/machine/h1910.conf +++ b/conf/machine/h1910.conf @@ -8,11 +8,10 @@ OVERRIDES =. "${KERNEL}:" TARGET_ARCH = "arm" IPKG_ARCHS = "all arm armv5te h1910" -include conf/machine/tune-xscale.conf +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 354e3a9552..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: @@ -42,9 +40,9 @@ SERIAL_CONSOLE = "115200 tts/0 vt100" USE_VT = "0" -include conf/machine/ipaq-common.conf -include conf/machine/handheld-common.conf +include conf/machine/include/ipaq-common.conf +include conf/machine/include/handheld-common.conf GUI_MACHINE_CLASS = "smallscreen" -include conf/machine/tune-xscale.conf +include conf/machine/include/tune-xscale.conf diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf index 48990d5618..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" @@ -35,8 +34,8 @@ USE_VT = "0" IMAGE_LINGUAS = "" -include conf/machine/ipaq-common.conf -include conf/machine/handheld-common.conf -include conf/machine/tune-strongarm.conf +include conf/machine/include/ipaq-common.conf +include conf/machine/include/handheld-common.conf +include conf/machine/include/tune-strongarm.conf SERIAL_CONSOLE = "115200 ttySA0" diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index cff74131d5..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" @@ -33,10 +29,10 @@ SERIAL_CONSOLE = "115200 tts/0 vt100" USE_DEVFS_kernel24 = "1" USE_VT = "0" -include conf/machine/ipaq-common.conf -include conf/machine/handheld-common.conf +include conf/machine/include/ipaq-common.conf +include conf/machine/include/handheld-common.conf GUI_MACHINE_CLASS = "smallscreen" #use tune xscale for extra performance. Distro feeds be built with tune-strongarm -include conf/machine/tune-xscale.conf +include conf/machine/include/tune-xscale.conf diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf index 166701a46b..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)}" @@ -26,4 +24,4 @@ SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" #Use OMAP 1510 cpu specifig arm9tdmi options for gcc -include conf/machine/tune-arm9tdmi.conf +include conf/machine/include/tune-arm9tdmi.conf diff --git a/conf/machine/include/.mtn2git_empty b/conf/machine/include/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/conf/machine/include/.mtn2git_empty diff --git a/conf/machine/handheld-common.conf b/conf/machine/include/handheld-common.conf index 40fd9780f9..467d5e59f1 100644 --- a/conf/machine/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/ipaq-common.conf b/conf/machine/include/ipaq-common.conf index 791abd2103..eb696cf9f9 100644 --- a/conf/machine/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/poodle-2.4.conf b/conf/machine/include/poodle-2.4.conf index dc603d3bcc..5453fda605 100644 --- a/conf/machine/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/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf index 7edebad2d3..885bf40b4f 100644 --- a/conf/machine/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/thinclient-common.conf b/conf/machine/include/thinclient-common.conf index e6c97886c9..4a96b42525 100644 --- a/conf/machine/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/tosa-2.4.conf b/conf/machine/include/tosa-2.4.conf index 6e208f4fc6..88df07cddb 100644 --- a/conf/machine/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/tosa-2.6.conf b/conf/machine/include/tosa-2.6.conf index 5455e3f0d5..fdd706d093 100644 --- a/conf/machine/tosa-2.6.conf +++ b/conf/machine/include/tosa-2.6.conf @@ -1,4 +1,4 @@ -include conf/machine/zaurus-clamshell-2.6.conf +include conf/machine/include/zaurus-clamshell-2.6.conf # SOUND Modules BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd kernel-module-snd-ac97-bus kernel-module-snd-ac97-codec kernel-module-snd-mixer-oss kernel-module-snd-page-alloc kernel-module-snd-pcm kernel-module-snd-pcm-oss kernel-module-snd-pxa2xx-ac97 kernel-module-snd-pxa2xx-pcm kernel-module-snd-timer kernel-module-soundcore" diff --git a/conf/machine/tune-arm920t.conf b/conf/machine/include/tune-arm920t.conf index 936b137517..936b137517 100644 --- a/conf/machine/tune-arm920t.conf +++ b/conf/machine/include/tune-arm920t.conf diff --git a/conf/machine/tune-arm926ejs.conf b/conf/machine/include/tune-arm926ejs.conf index 5e2f6b7c62..5e2f6b7c62 100644 --- a/conf/machine/tune-arm926ejs.conf +++ b/conf/machine/include/tune-arm926ejs.conf diff --git a/conf/machine/tune-arm9tdmi.conf b/conf/machine/include/tune-arm9tdmi.conf index cfc3bad1c1..cfc3bad1c1 100644 --- a/conf/machine/tune-arm9tdmi.conf +++ b/conf/machine/include/tune-arm9tdmi.conf diff --git a/conf/machine/tune-c3.conf b/conf/machine/include/tune-c3.conf index e6a522af10..e6a522af10 100644 --- a/conf/machine/tune-c3.conf +++ b/conf/machine/include/tune-c3.conf diff --git a/conf/machine/tune-ppc603e.conf b/conf/machine/include/tune-ppc603e.conf index 7c8714cfc2..7c8714cfc2 100644 --- a/conf/machine/tune-ppc603e.conf +++ b/conf/machine/include/tune-ppc603e.conf diff --git a/conf/machine/tune-ppce500.conf b/conf/machine/include/tune-ppce500.conf index 11717eba70..11717eba70 100644 --- a/conf/machine/tune-ppce500.conf +++ b/conf/machine/include/tune-ppce500.conf diff --git a/conf/machine/tune-sh3.conf b/conf/machine/include/tune-sh3.conf index 192dd8fd22..192dd8fd22 100644 --- a/conf/machine/tune-sh3.conf +++ b/conf/machine/include/tune-sh3.conf diff --git a/conf/machine/tune-sh4.conf b/conf/machine/include/tune-sh4.conf index 866f7f89d5..866f7f89d5 100644 --- a/conf/machine/tune-sh4.conf +++ b/conf/machine/include/tune-sh4.conf diff --git a/conf/machine/tune-strongarm.conf b/conf/machine/include/tune-strongarm.conf index 8654c996ef..8654c996ef 100644 --- a/conf/machine/tune-strongarm.conf +++ b/conf/machine/include/tune-strongarm.conf diff --git a/conf/machine/tune-supersparc.conf b/conf/machine/include/tune-supersparc.conf index 1b1ec1207f..1b1ec1207f 100644 --- a/conf/machine/tune-supersparc.conf +++ b/conf/machine/include/tune-supersparc.conf diff --git a/conf/machine/tune-xscale.conf b/conf/machine/include/tune-xscale.conf index 0b98f09fc8..0b98f09fc8 100644 --- a/conf/machine/tune-xscale.conf +++ b/conf/machine/include/tune-xscale.conf diff --git a/conf/machine/zaurus-clamshell-2.4.conf b/conf/machine/include/zaurus-clamshell-2.4.conf index d61dc197b2..184258c8b6 100644 --- a/conf/machine/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/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf index 757fc6acf3..e89183b204 100644 --- a/conf/machine/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/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf index f55f2d2554..e4d7616510 100644 --- a/conf/machine/zaurus-clamshell.conf +++ b/conf/machine/include/zaurus-clamshell.conf @@ -4,22 +4,20 @@ 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" -include conf/machine/handheld-common.conf +include conf/machine/include/handheld-common.conf # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/tune-xscale.conf +include conf/machine/include/tune-xscale.conf SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index 626b5cf218..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)}" @@ -23,15 +20,15 @@ PXA270_MODULES = "g_ether g_file_storage g_serial gadgetfs pxa27x_udc \ SERIAL_CONSOLE = "115200 ttyS0" -include conf/machine/ipaq-common.conf -include conf/machine/handheld-common.conf +include conf/machine/include/ipaq-common.conf +include conf/machine/include/handheld-common.conf GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_DEPENDS += "gaim" GPE_EXTRA_INSTALL += "gaim" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/tune-xscale.conf +include conf/machine/include/tune-xscale.conf BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}" HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \ diff --git a/conf/machine/jornada56x.conf b/conf/machine/jornada56x.conf index 4ac63b556d..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" @@ -16,5 +15,5 @@ USE_DEVFS = "1" SERIAL_CONSOLE = "115200 ttySA0" -include conf/machine/handheld-common.conf -include conf/machine/tune-strongarm.conf +include conf/machine/include/handheld-common.conf +include conf/machine/include/tune-strongarm.conf diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf index 5e81c35430..6526f50ef4 100644 --- a/conf/machine/jornada6xx.conf +++ b/conf/machine/jornada6xx.conf @@ -7,4 +7,4 @@ IPKG_ARCHS = "all sh3 ${MACHINE}" PREFERRED_VERSION_glibc = "2.3.4" PREFERRED_VERSION_glibc-initial = "2.3.4" -include conf/machine/tune-sh3.conf +include conf/machine/include/tune-sh3.conf diff --git a/conf/machine/jornada7xx.conf b/conf/machine/jornada7xx.conf index b3e1840469..82eff0b563 100644 --- a/conf/machine/jornada7xx.conf +++ b/conf/machine/jornada7xx.conf @@ -5,4 +5,4 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm ${MACHINE}" -include conf/machine/tune-strongarm.conf
\ No newline at end of file +include conf/machine/include/tune-strongarm.conf
\ No newline at end of file diff --git a/conf/machine/lite5200.conf b/conf/machine/lite5200.conf index f990d1390e..8df7b51d69 100644 --- a/conf/machine/lite5200.conf +++ b/conf/machine/lite5200.conf @@ -16,4 +16,4 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" IMAGE_FSTYPES = "jffs2 tar.bz2" -include conf/machine/tune-ppc603e.conf +include conf/machine/include/tune-ppc603e.conf diff --git a/conf/machine/mainstone.conf b/conf/machine/mainstone.conf index f3981ed4c5..ff899f44e1 100644 --- a/conf/machine/mainstone.conf +++ b/conf/machine/mainstone.conf @@ -9,9 +9,7 @@ IPKG_ARCHS = "all arm armv5te ${MACHINE}" PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" -BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel" - -include conf/machine/tune-xscale.conf +include conf/machine/include/tune-xscale.conf # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/nas100d.conf b/conf/machine/nas100d.conf index aa37f0920d..45df317bac 100644 --- a/conf/machine/nas100d.conf +++ b/conf/machine/nas100d.conf @@ -135,12 +135,12 @@ USE_VT = "0" #------------------------------------------------------------------------------- # Package versions #------------------------------------------------------------------------------- -CVSDATE_gnu-config ?= "20050713" -CVSDATE_gnu-config-native ?= "20050713" -CVSDATE_ipkg-utils ?= "20050713" -CVSDATE_ipkg-utils-native ?= "20050713" -CVSDATE_ipkg-link ?= "20050713" -CVSDATE_irssi ?= "20050930" +SRCDATE_gnu-config ?= "20050713" +SRCDATE_gnu-config-native ?= "20050713" +SRCDATE_ipkg-utils ?= "20050713" +SRCDATE_ipkg-utils-native ?= "20050713" +SRCDATE_ipkg-link ?= "20050713" +SRCDATE_irssi ?= "20050930" CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/" INHERIT += "nslu2-mirrors" 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 9f49f24563..7b9a24ba0c 100644 --- a/conf/machine/nokia770.conf +++ b/conf/machine/nokia770.conf @@ -15,7 +15,7 @@ GPE_EXTRA_DEPENDS += "gaim sylpheed gpe-mini-browser tscalib" GPE_EXTRA_INSTALL += "gaim sylpheed gpe-mini-browser tscalib" # Use tune-arm926 per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/tune-arm926ejs.conf +include conf/machine/include/tune-arm926ejs.conf #size of the root partition (yes, it is 123 MB) @@ -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" @@ -56,5 +53,5 @@ pcmcia-cs apm ppp wireless-tools console-tools" ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; " -include conf/machine/handheld-common.conf +include conf/machine/include/handheld-common.conf diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf index 1f70d9923b..8c4e253407 100644 --- a/conf/machine/nslu2.conf +++ b/conf/machine/nslu2.conf @@ -141,10 +141,10 @@ USE_VT = "0" #------------------------------------------------------------------------------- # Package versions #------------------------------------------------------------------------------- -CVSDATE_ipkg-utils ?= "20060106" -CVSDATE_ipkg-utils-native ?= "20060106" -CVSDATE_ipkg-link ?= "20060106" -CVSDATE_irssi ?= "20050930" +SRCDATE_ipkg-utils ?= "20060106" +SRCDATE_ipkg-utils-native ?= "20060106" +SRCDATE_ipkg-link ?= "20060106" +SRCDATE_irssi ?= "20050930" CVS_TARBALL_STASH = "http://sources.nslu2-linux.org/sources/" INHERIT += "nslu2-mirrors" diff --git a/conf/machine/omap1510inn.conf b/conf/machine/omap1510inn.conf index 40aaa2917a..9c460b44b8 100644 --- a/conf/machine/omap1510inn.conf +++ b/conf/machine/omap1510inn.conf @@ -9,10 +9,9 @@ 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" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" -include conf/machine/tune-arm926ejs.conf +include conf/machine/include/tune-arm926ejs.conf diff --git a/conf/machine/omap1610h2.conf b/conf/machine/omap1610h2.conf index 40aaa2917a..9c460b44b8 100644 --- a/conf/machine/omap1610h2.conf +++ b/conf/machine/omap1610h2.conf @@ -9,10 +9,9 @@ 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" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" -include conf/machine/tune-arm926ejs.conf +include conf/machine/include/tune-arm926ejs.conf diff --git a/conf/machine/omap1710h3.conf b/conf/machine/omap1710h3.conf index 40aaa2917a..9c460b44b8 100644 --- a/conf/machine/omap1710h3.conf +++ b/conf/machine/omap1710h3.conf @@ -9,10 +9,9 @@ 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" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" -include conf/machine/tune-arm926ejs.conf +include conf/machine/include/tune-arm926ejs.conf diff --git a/conf/machine/omap2420h4.conf b/conf/machine/omap2420h4.conf index 2e81beb306..db333b2e19 100644 --- a/conf/machine/omap2420h4.conf +++ b/conf/machine/omap2420h4.conf @@ -9,10 +9,9 @@ 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" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" -include conf/machine/tune-arm926ejs.conf +include conf/machine/include/tune-arm926ejs.conf diff --git a/conf/machine/omap5912osk.conf b/conf/machine/omap5912osk.conf index de21822b15..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" @@ -31,4 +30,4 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-cfbfillrect kernel-module-omapfb kern # DSP Interface BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-dsp" -include conf/machine/tune-arm926ejs.conf +include conf/machine/include/tune-arm926ejs.conf diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf index 8b33912835..a1bf5fbec3 100644 --- a/conf/machine/poodle.conf +++ b/conf/machine/poodle.conf @@ -6,20 +6,20 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm armv4 armv5te poodle" KERNEL_VERSION ?= "2.4" -include conf/machine/poodle-${KERNEL_VERSION}.conf +include conf/machine/include/poodle-${KERNEL_VERSION}.conf 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/handheld-common.conf +include conf/machine/include/handheld-common.conf ROOT_FLASH_SIZE = "22" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/tune-xscale.conf +include conf/machine/include/tune-xscale.conf SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf index 56cc2c0852..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" @@ -46,6 +40,6 @@ USE_VT = "0" GPE_EXTRA_DEPENDS += "gaim sylpheed suspend-desktop" GPE_EXTRA_INSTALL += "gaim sylpheed suspend-desktop" -include conf/machine/handheld-common.conf -include conf/machine/tune-strongarm.conf +include conf/machine/include/handheld-common.conf +include conf/machine/include/tune-strongarm.conf diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index 2b22680554..e1cb468d8f 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -4,15 +4,13 @@ KERNEL_VERSION ?= "2.6" -include conf/machine/zaurus-clamshell.conf -include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf +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 20cf6946ae..a4bdba8675 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -6,21 +6,21 @@ TARGET_ARCH = "arm" IPKG_ARCHS = "all arm armv4 armv5te tosa" KERNEL_VERSION ?= "2.4" -include conf/machine/tosa-${KERNEL_VERSION}.conf +include conf/machine/include/tosa-${KERNEL_VERSION}.conf 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" ROOT_FLASH_SIZE = "28" -include conf/machine/handheld-common.conf +include conf/machine/include/handheld-common.conf # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/tune-xscale.conf +include conf/machine/include/tune-xscale.conf SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/triton.conf b/conf/machine/triton.conf index aea420907f..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" @@ -15,5 +14,5 @@ SERIAL_CONSOLE = "38400 ttyS0" KERNEL_CONSOLE = "ttys0,38400" USE_VT = "0" -include conf/machine/tune-xscale.conf +include conf/machine/include/tune-xscale.conf 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" |