From b6079b6c268d8df773e42a191f12c9afcd17d1c6 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 7 Jan 2006 21:42:26 +0000 Subject: Convert CVSDATE -> SRCDATE. Also standardise cvs and svn PVs to x.x.x+cvsYYYYMMDD format and some includes some minor whitespace cleanup. --- conf/machine/nas100d.conf | 12 ++++++------ conf/machine/nslu2.conf | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'conf/machine') 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/nslu2.conf b/conf/machine/nslu2.conf index be85a82048..a28591dc57 100644 --- a/conf/machine/nslu2.conf +++ b/conf/machine/nslu2.conf @@ -141,12 +141,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" -- cgit v1.2.3 From 36408e8982f7a59193143e5e883266d2e8a6e385 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 7 Jan 2006 23:55:36 +0000 Subject: Move machine include files (files that are not machines in their own right) into conf/machine/include. --- conf/machine/akita.conf | 4 +-- conf/machine/blueangel.conf | 4 +-- conf/machine/borzoi.conf | 4 +-- conf/machine/c7x0.conf | 4 +-- conf/machine/collie.conf | 4 +-- conf/machine/devkitidp-pxa255.conf | 2 +- conf/machine/epia.conf | 2 +- conf/machine/h1910.conf | 2 +- conf/machine/h2200.conf | 6 ++-- conf/machine/h3600.conf | 6 ++-- conf/machine/h3900.conf | 6 ++-- conf/machine/h6300.conf | 2 +- conf/machine/handheld-common.conf | 26 -------------- conf/machine/include/.mtn2git_empty | 0 conf/machine/include/handheld-common.conf | 26 ++++++++++++++ conf/machine/include/ipaq-common.conf | 9 +++++ conf/machine/include/poodle-2.4.conf | 14 ++++++++ conf/machine/include/poodle-2.6.conf | 5 +++ conf/machine/include/thinclient-common.conf | 20 +++++++++++ conf/machine/include/tosa-2.4.conf | 23 ++++++++++++ conf/machine/include/tosa-2.6.conf | 14 ++++++++ conf/machine/include/tune-arm920t.conf | 2 ++ conf/machine/include/tune-arm926ejs.conf | 3 ++ conf/machine/include/tune-arm9tdmi.conf | 1 + conf/machine/include/tune-c3.conf | 3 ++ conf/machine/include/tune-ppc603e.conf | 2 ++ conf/machine/include/tune-ppce500.conf | 2 ++ conf/machine/include/tune-sh3.conf | 1 + conf/machine/include/tune-sh4.conf | 1 + conf/machine/include/tune-strongarm.conf | 2 ++ conf/machine/include/tune-supersparc.conf | 2 ++ conf/machine/include/tune-xscale.conf | 3 ++ conf/machine/include/zaurus-clamshell-2.4.conf | 48 ++++++++++++++++++++++++++ conf/machine/include/zaurus-clamshell-2.6.conf | 48 ++++++++++++++++++++++++++ conf/machine/include/zaurus-clamshell.conf | 25 ++++++++++++++ conf/machine/ipaq-common.conf | 9 ----- conf/machine/ipaq-pxa270.conf | 6 ++-- conf/machine/jornada56x.conf | 4 +-- conf/machine/jornada6xx.conf | 2 +- conf/machine/jornada7xx.conf | 2 +- conf/machine/lite5200.conf | 2 +- conf/machine/mainstone.conf | 2 +- conf/machine/nokia770.conf | 4 +-- conf/machine/omap1510inn.conf | 2 +- conf/machine/omap1610h2.conf | 2 +- conf/machine/omap1710h3.conf | 2 +- conf/machine/omap2420h4.conf | 2 +- conf/machine/omap5912osk.conf | 2 +- conf/machine/poodle-2.4.conf | 14 -------- conf/machine/poodle-2.6.conf | 5 --- conf/machine/poodle.conf | 6 ++-- conf/machine/simpad.conf | 4 +-- conf/machine/spitz.conf | 4 +-- conf/machine/thinclient-common.conf | 20 ----------- conf/machine/tosa-2.4.conf | 23 ------------ conf/machine/tosa-2.6.conf | 14 -------- conf/machine/tosa.conf | 6 ++-- conf/machine/triton.conf | 2 +- conf/machine/tune-arm920t.conf | 2 -- conf/machine/tune-arm926ejs.conf | 3 -- conf/machine/tune-arm9tdmi.conf | 1 - conf/machine/tune-c3.conf | 3 -- conf/machine/tune-ppc603e.conf | 2 -- conf/machine/tune-ppce500.conf | 2 -- conf/machine/tune-sh3.conf | 1 - conf/machine/tune-sh4.conf | 1 - conf/machine/tune-strongarm.conf | 2 -- conf/machine/tune-supersparc.conf | 2 -- conf/machine/tune-xscale.conf | 3 -- conf/machine/zaurus-clamshell-2.4.conf | 48 -------------------------- conf/machine/zaurus-clamshell-2.6.conf | 48 -------------------------- conf/machine/zaurus-clamshell.conf | 25 -------------- 72 files changed, 304 insertions(+), 304 deletions(-) delete mode 100644 conf/machine/handheld-common.conf create mode 100644 conf/machine/include/.mtn2git_empty create mode 100644 conf/machine/include/handheld-common.conf create mode 100644 conf/machine/include/ipaq-common.conf create mode 100644 conf/machine/include/poodle-2.4.conf create mode 100644 conf/machine/include/poodle-2.6.conf create mode 100644 conf/machine/include/thinclient-common.conf create mode 100644 conf/machine/include/tosa-2.4.conf create mode 100644 conf/machine/include/tosa-2.6.conf create mode 100644 conf/machine/include/tune-arm920t.conf create mode 100644 conf/machine/include/tune-arm926ejs.conf create mode 100644 conf/machine/include/tune-arm9tdmi.conf create mode 100644 conf/machine/include/tune-c3.conf create mode 100644 conf/machine/include/tune-ppc603e.conf create mode 100644 conf/machine/include/tune-ppce500.conf create mode 100644 conf/machine/include/tune-sh3.conf create mode 100644 conf/machine/include/tune-sh4.conf create mode 100644 conf/machine/include/tune-strongarm.conf create mode 100644 conf/machine/include/tune-supersparc.conf create mode 100644 conf/machine/include/tune-xscale.conf create mode 100644 conf/machine/include/zaurus-clamshell-2.4.conf create mode 100644 conf/machine/include/zaurus-clamshell-2.6.conf create mode 100644 conf/machine/include/zaurus-clamshell.conf delete mode 100644 conf/machine/ipaq-common.conf delete mode 100644 conf/machine/poodle-2.4.conf delete mode 100644 conf/machine/poodle-2.6.conf delete mode 100644 conf/machine/thinclient-common.conf delete mode 100644 conf/machine/tosa-2.4.conf delete mode 100644 conf/machine/tosa-2.6.conf delete mode 100644 conf/machine/tune-arm920t.conf delete mode 100644 conf/machine/tune-arm926ejs.conf delete mode 100644 conf/machine/tune-arm9tdmi.conf delete mode 100644 conf/machine/tune-c3.conf delete mode 100644 conf/machine/tune-ppc603e.conf delete mode 100644 conf/machine/tune-ppce500.conf delete mode 100644 conf/machine/tune-sh3.conf delete mode 100644 conf/machine/tune-sh4.conf delete mode 100644 conf/machine/tune-strongarm.conf delete mode 100644 conf/machine/tune-supersparc.conf delete mode 100644 conf/machine/tune-xscale.conf delete mode 100644 conf/machine/zaurus-clamshell-2.4.conf delete mode 100644 conf/machine/zaurus-clamshell-2.6.conf delete mode 100644 conf/machine/zaurus-clamshell.conf (limited to 'conf/machine') 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..196cd51ebb 100644 --- a/conf/machine/blueangel.conf +++ b/conf/machine/blueangel.conf @@ -26,10 +26,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..83899514f5 100644 --- a/conf/machine/borzoi.conf +++ b/conf/machine/borzoi.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 PIVOTBOOT_EXTRA_DEPENDS += "pivotinit pcmcia-cs" PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit pcmcia-cs" 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/collie.conf b/conf/machine/collie.conf index 4af42deb24..a8226ea04e 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -22,8 +22,8 @@ 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..329ac6816d 100644 --- a/conf/machine/devkitidp-pxa255.conf +++ b/conf/machine/devkitidp-pxa255.conf @@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel" BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel virtual/bootloader" -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..2963131486 100644 --- a/conf/machine/epia.conf +++ b/conf/machine/epia.conf @@ -10,5 +10,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/h1910.conf b/conf/machine/h1910.conf index 468fcf1838..0c602398c7 100644 --- a/conf/machine/h1910.conf +++ b/conf/machine/h1910.conf @@ -8,7 +8,7 @@ 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" diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf index 354e3a9552..4526006cfe 100644 --- a/conf/machine/h2200.conf +++ b/conf/machine/h2200.conf @@ -42,9 +42,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..96651aa6ae 100644 --- a/conf/machine/h3600.conf +++ b/conf/machine/h3600.conf @@ -35,8 +35,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..a047761598 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -33,10 +33,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..85a6d36950 100644 --- a/conf/machine/h6300.conf +++ b/conf/machine/h6300.conf @@ -26,4 +26,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/handheld-common.conf b/conf/machine/handheld-common.conf deleted file mode 100644 index 40fd9780f9..0000000000 --- a/conf/machine/handheld-common.conf +++ /dev/null @@ -1,26 +0,0 @@ -HANDHELD_MODULES = "ipv6 \ -ipsec \ -nvrd \ -mip6-mn \ -tun \ -ide-cs ide-disk ide-probe-mod \ -loop \ -vfat ext2 \ -sunrpc nfs \ -btuart-cs dtl1-cs bt3c-cs rfcomm bnep l2cap sco hci_uart \ -pcnet-cs serial-cs airo-cs \ -af_packet \ -ppp-async ppp-deflate ppp-mppe \ -ip-gre ip-tables ipip \ -irda irlan irnet irport irtty ircomm-tty \ -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)}" - -INHERIT += "linux_modules" diff --git a/conf/machine/include/.mtn2git_empty b/conf/machine/include/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/conf/machine/include/handheld-common.conf b/conf/machine/include/handheld-common.conf new file mode 100644 index 0000000000..40fd9780f9 --- /dev/null +++ b/conf/machine/include/handheld-common.conf @@ -0,0 +1,26 @@ +HANDHELD_MODULES = "ipv6 \ +ipsec \ +nvrd \ +mip6-mn \ +tun \ +ide-cs ide-disk ide-probe-mod \ +loop \ +vfat ext2 \ +sunrpc nfs \ +btuart-cs dtl1-cs bt3c-cs rfcomm bnep l2cap sco hci_uart \ +pcnet-cs serial-cs airo-cs \ +af_packet \ +ppp-async ppp-deflate ppp-mppe \ +ip-gre ip-tables ipip \ +irda irlan irnet irport irtty ircomm-tty \ +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)}" + +INHERIT += "linux_modules" diff --git a/conf/machine/include/ipaq-common.conf b/conf/machine/include/ipaq-common.conf new file mode 100644 index 0000000000..791abd2103 --- /dev/null +++ b/conf/machine/include/ipaq-common.conf @@ -0,0 +1,9 @@ +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" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" + diff --git a/conf/machine/include/poodle-2.4.conf b/conf/machine/include/poodle-2.4.conf new file mode 100644 index 0000000000..dc603d3bcc --- /dev/null +++ b/conf/machine/include/poodle-2.4.conf @@ -0,0 +1,14 @@ +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 \ +hostap-utils prism3-firmware prism3-support" + diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf new file mode 100644 index 0000000000..7edebad2d3 --- /dev/null +++ b/conf/machine/include/poodle-2.6.conf @@ -0,0 +1,5 @@ +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 new file mode 100644 index 0000000000..e6c97886c9 --- /dev/null +++ b/conf/machine/include/thinclient-common.conf @@ -0,0 +1,20 @@ +THINCLIENT_MODULES = "ipv6 \ +mip6-mn \ +tun \ +loop \ +vfat \ +sunrpc nfs \ +rfcomm bnep l2cap sco \ +af_packet \ +ppp-async ppp-deflate ppp-mppe \ +ip-gre ip-tables ipip \ +irda irlan irnet irport irtty \ +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)}" + +INHERIT += "linux_modules" diff --git a/conf/machine/include/tosa-2.4.conf b/conf/machine/include/tosa-2.4.conf new file mode 100644 index 0000000000..6e208f4fc6 --- /dev/null +++ b/conf/machine/include/tosa-2.4.conf @@ -0,0 +1,23 @@ +PREFERRED_PROVIDER_xserver = "xserver-kdrive" +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 \ + kernel-module-pxa-bi kernel-module-registers \ + kernel-module-storage-fd kernel-module-usb-ohci-tc6393 \ + kernel hostap-modules-cs orinoco-modules-cs \ + sharp-sdmmc-support kernel-module-pxa-bi \ + kernel-module-ip-gre kernel-module-irnet kernel-module-ipip \ + kernel-module-usbcore kernel-module-usbdcore kernel-module-usbdmonitor kernel-module-usb-storage" + +RRECOMMENDS += "kernel-module-usbdserial kernel-module-usbkbd \ + kernel-module-usbmouse kernel-module-hid usbutils \ + kernel-module-evdev" + diff --git a/conf/machine/include/tosa-2.6.conf b/conf/machine/include/tosa-2.6.conf new file mode 100644 index 0000000000..fdd706d093 --- /dev/null +++ b/conf/machine/include/tosa-2.6.conf @@ -0,0 +1,14 @@ +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" + +module_autoload_snd-pxa2xx-ac97 = "snd-pxa2xx-ac97" +module_autoload_snd-pcm-oss ="snd-pcm-oss" + +# WM97xx Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx" +module_autoload_wm9705 = "wm9705" +#module_autoload_pxa-wm97xx = "pen_int=0" + +#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx" +#module_autoload_wm97xx = "wm97xx" diff --git a/conf/machine/include/tune-arm920t.conf b/conf/machine/include/tune-arm920t.conf new file mode 100644 index 0000000000..936b137517 --- /dev/null +++ b/conf/machine/include/tune-arm920t.conf @@ -0,0 +1,2 @@ +TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" + diff --git a/conf/machine/include/tune-arm926ejs.conf b/conf/machine/include/tune-arm926ejs.conf new file mode 100644 index 0000000000..5e2f6b7c62 --- /dev/null +++ b/conf/machine/include/tune-arm926ejs.conf @@ -0,0 +1,3 @@ +#if gcc breaks change arm926ejs to arm926ej-s +TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" +PACKAGE_ARCH = "armv5te" diff --git a/conf/machine/include/tune-arm9tdmi.conf b/conf/machine/include/tune-arm9tdmi.conf new file mode 100644 index 0000000000..cfc3bad1c1 --- /dev/null +++ b/conf/machine/include/tune-arm9tdmi.conf @@ -0,0 +1 @@ +TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi" diff --git a/conf/machine/include/tune-c3.conf b/conf/machine/include/tune-c3.conf new file mode 100644 index 0000000000..e6a522af10 --- /dev/null +++ b/conf/machine/include/tune-c3.conf @@ -0,0 +1,3 @@ +TARGET_CC_ARCH = "-march=c3 -mtune=c3" +PACKAGE_ARCH = "i586" + diff --git a/conf/machine/include/tune-ppc603e.conf b/conf/machine/include/tune-ppc603e.conf new file mode 100644 index 0000000000..7c8714cfc2 --- /dev/null +++ b/conf/machine/include/tune-ppc603e.conf @@ -0,0 +1,2 @@ +TARGET_CC_ARCH = "-mcpu=603e" +PACKAGE_ARCH = "ppc603e" diff --git a/conf/machine/include/tune-ppce500.conf b/conf/machine/include/tune-ppce500.conf new file mode 100644 index 0000000000..11717eba70 --- /dev/null +++ b/conf/machine/include/tune-ppce500.conf @@ -0,0 +1,2 @@ +TARGET_CC_ARCH = "-mcpu=8540" +PACKAGE_ARCH = "ppce500" diff --git a/conf/machine/include/tune-sh3.conf b/conf/machine/include/tune-sh3.conf new file mode 100644 index 0000000000..192dd8fd22 --- /dev/null +++ b/conf/machine/include/tune-sh3.conf @@ -0,0 +1 @@ +TARGET_CC_ARCH = "-ml -m3" diff --git a/conf/machine/include/tune-sh4.conf b/conf/machine/include/tune-sh4.conf new file mode 100644 index 0000000000..866f7f89d5 --- /dev/null +++ b/conf/machine/include/tune-sh4.conf @@ -0,0 +1 @@ +TARGET_CC_ARCH = "-ml -m4" diff --git a/conf/machine/include/tune-strongarm.conf b/conf/machine/include/tune-strongarm.conf new file mode 100644 index 0000000000..8654c996ef --- /dev/null +++ b/conf/machine/include/tune-strongarm.conf @@ -0,0 +1,2 @@ +TARGET_CC_ARCH = "-march=armv4 -mtune=xscale" + diff --git a/conf/machine/include/tune-supersparc.conf b/conf/machine/include/tune-supersparc.conf new file mode 100644 index 0000000000..1b1ec1207f --- /dev/null +++ b/conf/machine/include/tune-supersparc.conf @@ -0,0 +1,2 @@ +TARGET_CC_ARCH = "-mcpu=supersparc" +PACKAGE_ARCH = "supersparc" diff --git a/conf/machine/include/tune-xscale.conf b/conf/machine/include/tune-xscale.conf new file mode 100644 index 0000000000..0b98f09fc8 --- /dev/null +++ b/conf/machine/include/tune-xscale.conf @@ -0,0 +1,3 @@ +TARGET_CC_ARCH = "-march=armv5te -mtune=xscale" +PACKAGE_ARCH = "armv5te" + diff --git a/conf/machine/include/zaurus-clamshell-2.4.conf b/conf/machine/include/zaurus-clamshell-2.4.conf new file mode 100644 index 0000000000..d61dc197b2 --- /dev/null +++ b/conf/machine/include/zaurus-clamshell-2.4.conf @@ -0,0 +1,48 @@ +# Zaurus Clamshell specific configuration for kernel 2.4 +# Don't forget to include zaurus-clamshell.conf as well + +PREFERRED_PROVIDERS_append_c7x0 = " virtual/kernel:c7x0-kernels-2.4-embedix" +PREFERRED_PROVIDERS_append_akita = " virtual/kernel:openzaurus-pxa27x" +PREFERRED_PROVIDERS_append_spitz = " virtual/kernel:openzaurus-pxa27x" +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" + +# Misc Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-net-fd kernel-module-registers" + +# USB Client Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-usbdcore kernel-module-usbdmonitor" + +# Bluetooth Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluez kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \ + kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \ + kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs \ + kernel-module-firmware-class kernel-module-bt3c-cs" + +# BI Module +BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 = " kernel-module-pxa-bi" +BOOTSTRAP_EXTRA_RDEPENDS_append_spitz = " kernel-module-pxa27x-bi" +BOOTSTRAP_EXTRA_RDEPENDS_append_akita = " kernel-module-pxa27x-bi" +BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi = " kernel-module-pxa27x-bi" + +# USB Host Modules +BOOTSTRAP_EXTRA_RDEPENDS_append_spitz = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \ + kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \ + kernel-module-usb-ohci-pxa27x kernel-module-bfusb" +BOOTSTRAP_EXTRA_RDEPENDS_append_akita = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \ + kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \ + kernel-module-usb-ohci-pxa27x kernel-module-bfusb" +BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \ + kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \ + kernel-module-usb-ohci-pxa27x kernel-module-bfusb" + diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf new file mode 100644 index 0000000000..757fc6acf3 --- /dev/null +++ b/conf/machine/include/zaurus-clamshell-2.6.conf @@ -0,0 +1,48 @@ +# Zaurus Clamshell specific configuration for kernel 2.6 +# Don't forget to include zaurus-clamshell.conf as well + +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" + +# Ethernet modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs" +# NFS Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc" +# Crypto Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5" +# SMB and CRAMFS +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs" +# Serial Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs" +# Bluetooth Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \ + kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \ + kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs" +# Infrared Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \ + kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb" + +# USB Gadget Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \ + kernel-module-g-serial kernel-module-g-ether" + +# Wireless Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \ + kernel-module-hermes kernel-module-orinoco \ + kernel-module-orinoco-cs kernel-module-spectrum-cs" + +# Sound Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc kernel-module-snd-timer \ + kernel-module-snd-pcm kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss \ + kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s" +BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 += " kernel-module-snd-soc-corgi kernel-module-snd-soc-wm8731 " +BOOTSTRAP_EXTRA_RDEPENDS_append_akita += " kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " +BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi += " kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " +BOOTSTRAP_EXTRA_RDEPENDS_append_spitz += " kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf new file mode 100644 index 0000000000..e0a26f3dc7 --- /dev/null +++ b/conf/machine/include/zaurus-clamshell.conf @@ -0,0 +1,25 @@ +TARGET_ARCH = "arm" +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" + +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/include/handheld-common.conf + +# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. +include conf/machine/include/tune-xscale.conf + +SERIAL_CONSOLE = "115200 ttyS0" diff --git a/conf/machine/ipaq-common.conf b/conf/machine/ipaq-common.conf deleted file mode 100644 index 791abd2103..0000000000 --- a/conf/machine/ipaq-common.conf +++ /dev/null @@ -1,9 +0,0 @@ -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" - -PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" - diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index 626b5cf218..33c8ad8aa5 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -23,15 +23,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..9de9eaba89 100644 --- a/conf/machine/jornada56x.conf +++ b/conf/machine/jornada56x.conf @@ -16,5 +16,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..2de75e020d 100644 --- a/conf/machine/mainstone.conf +++ b/conf/machine/mainstone.conf @@ -11,7 +11,7 @@ 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/nokia770.conf b/conf/machine/nokia770.conf index 9f49f24563..d023342ebb 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) @@ -56,5 +56,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/omap1510inn.conf b/conf/machine/omap1510inn.conf index 40aaa2917a..13792630a6 100644 --- a/conf/machine/omap1510inn.conf +++ b/conf/machine/omap1510inn.conf @@ -15,4 +15,4 @@ 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..13792630a6 100644 --- a/conf/machine/omap1610h2.conf +++ b/conf/machine/omap1610h2.conf @@ -15,4 +15,4 @@ 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..13792630a6 100644 --- a/conf/machine/omap1710h3.conf +++ b/conf/machine/omap1710h3.conf @@ -15,4 +15,4 @@ 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..19ddc39430 100644 --- a/conf/machine/omap2420h4.conf +++ b/conf/machine/omap2420h4.conf @@ -15,4 +15,4 @@ 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..a5a0fe88f2 100644 --- a/conf/machine/omap5912osk.conf +++ b/conf/machine/omap5912osk.conf @@ -31,4 +31,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-2.4.conf b/conf/machine/poodle-2.4.conf deleted file mode 100644 index dc603d3bcc..0000000000 --- a/conf/machine/poodle-2.4.conf +++ /dev/null @@ -1,14 +0,0 @@ -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 \ -hostap-utils prism3-firmware prism3-support" - diff --git a/conf/machine/poodle-2.6.conf b/conf/machine/poodle-2.6.conf deleted file mode 100644 index 7edebad2d3..0000000000 --- a/conf/machine/poodle-2.6.conf +++ /dev/null @@ -1,5 +0,0 @@ -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/poodle.conf b/conf/machine/poodle.conf index 8b33912835..dc83aa153d 100644 --- a/conf/machine/poodle.conf +++ b/conf/machine/poodle.conf @@ -6,7 +6,7 @@ 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" @@ -14,12 +14,12 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE BOOTSTRAP_EXTRA_DEPENDS += "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..edb18894cb 100644 --- a/conf/machine/simpad.conf +++ b/conf/machine/simpad.conf @@ -46,6 +46,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..171d23f8dc 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.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 PIVOTBOOT_EXTRA_DEPENDS += "pivotinit pcmcia-cs" PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit pcmcia-cs" diff --git a/conf/machine/thinclient-common.conf b/conf/machine/thinclient-common.conf deleted file mode 100644 index e6c97886c9..0000000000 --- a/conf/machine/thinclient-common.conf +++ /dev/null @@ -1,20 +0,0 @@ -THINCLIENT_MODULES = "ipv6 \ -mip6-mn \ -tun \ -loop \ -vfat \ -sunrpc nfs \ -rfcomm bnep l2cap sco \ -af_packet \ -ppp-async ppp-deflate ppp-mppe \ -ip-gre ip-tables ipip \ -irda irlan irnet irport irtty \ -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)}" - -INHERIT += "linux_modules" diff --git a/conf/machine/tosa-2.4.conf b/conf/machine/tosa-2.4.conf deleted file mode 100644 index 6e208f4fc6..0000000000 --- a/conf/machine/tosa-2.4.conf +++ /dev/null @@ -1,23 +0,0 @@ -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -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 \ - kernel-module-pxa-bi kernel-module-registers \ - kernel-module-storage-fd kernel-module-usb-ohci-tc6393 \ - kernel hostap-modules-cs orinoco-modules-cs \ - sharp-sdmmc-support kernel-module-pxa-bi \ - kernel-module-ip-gre kernel-module-irnet kernel-module-ipip \ - kernel-module-usbcore kernel-module-usbdcore kernel-module-usbdmonitor kernel-module-usb-storage" - -RRECOMMENDS += "kernel-module-usbdserial kernel-module-usbkbd \ - kernel-module-usbmouse kernel-module-hid usbutils \ - kernel-module-evdev" - diff --git a/conf/machine/tosa-2.6.conf b/conf/machine/tosa-2.6.conf deleted file mode 100644 index 5455e3f0d5..0000000000 --- a/conf/machine/tosa-2.6.conf +++ /dev/null @@ -1,14 +0,0 @@ -include conf/machine/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" - -module_autoload_snd-pxa2xx-ac97 = "snd-pxa2xx-ac97" -module_autoload_snd-pcm-oss ="snd-pcm-oss" - -# WM97xx Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx" -module_autoload_wm9705 = "wm9705" -#module_autoload_pxa-wm97xx = "pen_int=0" - -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx" -#module_autoload_wm97xx = "wm97xx" diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index 20cf6946ae..3f39cb7c19 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -6,7 +6,7 @@ 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" @@ -18,9 +18,9 @@ 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..9817545a51 100644 --- a/conf/machine/triton.conf +++ b/conf/machine/triton.conf @@ -15,5 +15,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/tune-arm920t.conf b/conf/machine/tune-arm920t.conf deleted file mode 100644 index 936b137517..0000000000 --- a/conf/machine/tune-arm920t.conf +++ /dev/null @@ -1,2 +0,0 @@ -TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" - diff --git a/conf/machine/tune-arm926ejs.conf b/conf/machine/tune-arm926ejs.conf deleted file mode 100644 index 5e2f6b7c62..0000000000 --- a/conf/machine/tune-arm926ejs.conf +++ /dev/null @@ -1,3 +0,0 @@ -#if gcc breaks change arm926ejs to arm926ej-s -TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" -PACKAGE_ARCH = "armv5te" diff --git a/conf/machine/tune-arm9tdmi.conf b/conf/machine/tune-arm9tdmi.conf deleted file mode 100644 index cfc3bad1c1..0000000000 --- a/conf/machine/tune-arm9tdmi.conf +++ /dev/null @@ -1 +0,0 @@ -TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi" diff --git a/conf/machine/tune-c3.conf b/conf/machine/tune-c3.conf deleted file mode 100644 index e6a522af10..0000000000 --- a/conf/machine/tune-c3.conf +++ /dev/null @@ -1,3 +0,0 @@ -TARGET_CC_ARCH = "-march=c3 -mtune=c3" -PACKAGE_ARCH = "i586" - diff --git a/conf/machine/tune-ppc603e.conf b/conf/machine/tune-ppc603e.conf deleted file mode 100644 index 7c8714cfc2..0000000000 --- a/conf/machine/tune-ppc603e.conf +++ /dev/null @@ -1,2 +0,0 @@ -TARGET_CC_ARCH = "-mcpu=603e" -PACKAGE_ARCH = "ppc603e" diff --git a/conf/machine/tune-ppce500.conf b/conf/machine/tune-ppce500.conf deleted file mode 100644 index 11717eba70..0000000000 --- a/conf/machine/tune-ppce500.conf +++ /dev/null @@ -1,2 +0,0 @@ -TARGET_CC_ARCH = "-mcpu=8540" -PACKAGE_ARCH = "ppce500" diff --git a/conf/machine/tune-sh3.conf b/conf/machine/tune-sh3.conf deleted file mode 100644 index 192dd8fd22..0000000000 --- a/conf/machine/tune-sh3.conf +++ /dev/null @@ -1 +0,0 @@ -TARGET_CC_ARCH = "-ml -m3" diff --git a/conf/machine/tune-sh4.conf b/conf/machine/tune-sh4.conf deleted file mode 100644 index 866f7f89d5..0000000000 --- a/conf/machine/tune-sh4.conf +++ /dev/null @@ -1 +0,0 @@ -TARGET_CC_ARCH = "-ml -m4" diff --git a/conf/machine/tune-strongarm.conf b/conf/machine/tune-strongarm.conf deleted file mode 100644 index 8654c996ef..0000000000 --- a/conf/machine/tune-strongarm.conf +++ /dev/null @@ -1,2 +0,0 @@ -TARGET_CC_ARCH = "-march=armv4 -mtune=xscale" - diff --git a/conf/machine/tune-supersparc.conf b/conf/machine/tune-supersparc.conf deleted file mode 100644 index 1b1ec1207f..0000000000 --- a/conf/machine/tune-supersparc.conf +++ /dev/null @@ -1,2 +0,0 @@ -TARGET_CC_ARCH = "-mcpu=supersparc" -PACKAGE_ARCH = "supersparc" diff --git a/conf/machine/tune-xscale.conf b/conf/machine/tune-xscale.conf deleted file mode 100644 index 0b98f09fc8..0000000000 --- a/conf/machine/tune-xscale.conf +++ /dev/null @@ -1,3 +0,0 @@ -TARGET_CC_ARCH = "-march=armv5te -mtune=xscale" -PACKAGE_ARCH = "armv5te" - diff --git a/conf/machine/zaurus-clamshell-2.4.conf b/conf/machine/zaurus-clamshell-2.4.conf deleted file mode 100644 index d61dc197b2..0000000000 --- a/conf/machine/zaurus-clamshell-2.4.conf +++ /dev/null @@ -1,48 +0,0 @@ -# Zaurus Clamshell specific configuration for kernel 2.4 -# Don't forget to include zaurus-clamshell.conf as well - -PREFERRED_PROVIDERS_append_c7x0 = " virtual/kernel:c7x0-kernels-2.4-embedix" -PREFERRED_PROVIDERS_append_akita = " virtual/kernel:openzaurus-pxa27x" -PREFERRED_PROVIDERS_append_spitz = " virtual/kernel:openzaurus-pxa27x" -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" - -# Misc Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-net-fd kernel-module-registers" - -# USB Client Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-usbdcore kernel-module-usbdmonitor" - -# Bluetooth Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluez kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \ - kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \ - kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs \ - kernel-module-firmware-class kernel-module-bt3c-cs" - -# BI Module -BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 = " kernel-module-pxa-bi" -BOOTSTRAP_EXTRA_RDEPENDS_append_spitz = " kernel-module-pxa27x-bi" -BOOTSTRAP_EXTRA_RDEPENDS_append_akita = " kernel-module-pxa27x-bi" -BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi = " kernel-module-pxa27x-bi" - -# USB Host Modules -BOOTSTRAP_EXTRA_RDEPENDS_append_spitz = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \ - kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \ - kernel-module-usb-ohci-pxa27x kernel-module-bfusb" -BOOTSTRAP_EXTRA_RDEPENDS_append_akita = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \ - kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \ - kernel-module-usb-ohci-pxa27x kernel-module-bfusb" -BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \ - kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \ - kernel-module-usb-ohci-pxa27x kernel-module-bfusb" - diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/zaurus-clamshell-2.6.conf deleted file mode 100644 index 757fc6acf3..0000000000 --- a/conf/machine/zaurus-clamshell-2.6.conf +++ /dev/null @@ -1,48 +0,0 @@ -# Zaurus Clamshell specific configuration for kernel 2.6 -# Don't forget to include zaurus-clamshell.conf as well - -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" - -# Ethernet modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs" -# NFS Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc" -# Crypto Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5" -# SMB and CRAMFS -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs" -# Serial Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs" -# Bluetooth Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \ - kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \ - kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs" -# Infrared Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \ - kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb" - -# USB Gadget Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \ - kernel-module-g-serial kernel-module-g-ether" - -# Wireless Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \ - kernel-module-hermes kernel-module-orinoco \ - kernel-module-orinoco-cs kernel-module-spectrum-cs" - -# Sound Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc kernel-module-snd-timer \ - kernel-module-snd-pcm kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss \ - kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s" -BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 += " kernel-module-snd-soc-corgi kernel-module-snd-soc-wm8731 " -BOOTSTRAP_EXTRA_RDEPENDS_append_akita += " kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " -BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi += " kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " -BOOTSTRAP_EXTRA_RDEPENDS_append_spitz += " kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " diff --git a/conf/machine/zaurus-clamshell.conf b/conf/machine/zaurus-clamshell.conf deleted file mode 100644 index f55f2d2554..0000000000 --- a/conf/machine/zaurus-clamshell.conf +++ /dev/null @@ -1,25 +0,0 @@ -TARGET_ARCH = "arm" -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" - -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 - -# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/tune-xscale.conf - -SERIAL_CONSOLE = "115200 ttyS0" -- cgit v1.2.3 From 00d6afcb893bec3fee68e3121c9d25999e833e27 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 8 Jan 2006 14:56:12 +0000 Subject: Following from the meta/packages changes, cleanup conf/machine for incorrect DEPENDS usage. Move certain things into EXTRA_IMAGEDEPENDS. No valid users of EXTRA_BOOTSTRAP_DEPENDS were found so it was removed entirely. Change zaurus-updater not to package as it doesn't provide any. --- conf/machine/blueangel.conf | 3 --- conf/machine/borzoi.conf | 2 -- conf/machine/colinux.conf | 1 - conf/machine/collie.conf | 2 -- conf/machine/devkitidp-pxa255.conf | 2 +- conf/machine/epia.conf | 1 - conf/machine/geodegx.conf | 1 - conf/machine/h1910.conf | 1 - conf/machine/h1940.conf | 2 -- conf/machine/h2200.conf | 4 +--- conf/machine/h3600.conf | 1 - conf/machine/h3900.conf | 4 ---- conf/machine/h6300.conf | 2 -- conf/machine/include/handheld-common.conf | 1 - conf/machine/include/ipaq-common.conf | 2 -- conf/machine/include/poodle-2.4.conf | 4 ---- conf/machine/include/poodle-2.6.conf | 1 - conf/machine/include/thinclient-common.conf | 1 - conf/machine/include/tosa-2.4.conf | 3 --- conf/machine/include/zaurus-clamshell-2.4.conf | 4 ---- conf/machine/include/zaurus-clamshell-2.6.conf | 4 ---- conf/machine/include/zaurus-clamshell.conf | 4 +--- conf/machine/ipaq-pxa270.conf | 3 --- conf/machine/jornada56x.conf | 1 - conf/machine/mainstone.conf | 2 -- conf/machine/netvista.conf | 2 -- conf/machine/nokia770.conf | 3 --- conf/machine/omap1510inn.conf | 1 - conf/machine/omap1610h2.conf | 1 - conf/machine/omap1710h3.conf | 1 - conf/machine/omap2420h4.conf | 1 - conf/machine/omap5912osk.conf | 1 - conf/machine/poodle.conf | 2 +- conf/machine/simpad.conf | 6 ------ conf/machine/spitz.conf | 3 --- conf/machine/sun4cdm.conf | 1 - conf/machine/tosa.conf | 2 +- conf/machine/triton.conf | 1 - conf/machine/wrt54.conf | 3 ++- conf/machine/x86.conf | 1 - 40 files changed, 7 insertions(+), 78 deletions(-) (limited to 'conf/machine') 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" -- cgit v1.2.3