Merge bk://oe-devel@oe-devel.bkbits.net/openembedded

into stealth.nexus.co.uk:/home/pb/oe/oe

2004/12/12 18:28:53+00:00 nexus.co.uk!pb
add /boot/params file for iPAQ, as found in Familiar 0.7.x.


BKrev: 41bc8e17NpC6xRd-tHBNtXHu9DI5bw

5 files changed, 53 insertions, 3 deletions

diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index 186759b998..c6f801c66a 100644
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -7,8 +7,8 @@ IPKG_ARCHS = "all arm ipaqsa h3600"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa"
 EXTRA_IMAGECMD_h3600 = "-e 0x40000 -p"
-BOOTSTRAP_EXTRA_DEPENDS = "handhelds-sa"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel ${@linux_module_packages('${H3600_MODULES}')}"
+BOOTSTRAP_EXTRA_DEPENDS = "handhelds-sa ipaq-boot-params"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${H3600_MODULES}')}"
 
 H3600_MODULES = "\
 h3600-asic \
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index 32186963d5..1ffa052bef 100644
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -12,10 +12,11 @@ IPKG_ARCHS = "all arm ipaqpxa h3900"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa"
 EXTRA_IMAGECMD_h3900 = "-e 0x40000 -p"
+BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params"
 BOOTSTRAP_EXTRA_DEPENDS_append_kernel24 = " handhelds-pxa at76c503a-modules"
 # at76c503a-modules not working with kernel26 yet
 BOOTSTRAP_EXTRA_DEPENDS_append_kernel26 = " handhelds-pxa-2.6 udev module-init-tools"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel ${@linux_module_packages('${H3900_MODULES}')}"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${H3900_MODULES}')}"
 BOOTSTRAP_EXTRA_RDEPENDS_append_kernel24 = " at76c503a-modules"
 BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools"
 H3900_MODULES = "h3900_asic h5400_asic pxa_ir h5400_buzzer h5400_fsi mmc_h5400 usb-ohci-h5400 mmc_asic3 mtdchar h5400-audio h3900-uda1380"
diff --git a/packages/ipaq-boot-params/ipaq-boot-params.bb b/packages/ipaq-boot-params/ipaq-boot-params.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ipaq-boot-params/ipaq-boot-params.bb
diff --git a/packages/ipaq-boot-params/params b/packages/ipaq-boot-params/params
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/ipaq-boot-params/params
diff --git a/packages/meta/task-bootstrap.bb b/packages/meta/task-bootstrap.bb
index e69de29bb2..8e6e72c47d 100644
--- a/packages/meta/task-bootstrap.bb
+++ b/packages/meta/task-bootstrap.bb
@@ -0,0 +1,49 @@
+DESCRIPTION = "Core packages required for a basic installation"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+PR = "r14"
+
+# The BOOTSTRAP_EXTRA_ variables are often manipulated by the
+# MACHINE .conf files, so adjust PACKAGE_ARCH accordingly.
+PACKAGE_ARCH := "${MACHINE_ARCH}"
+
+ALLOW_EMPTY = 1
+PACKAGES = "${PN}"
+
+MODUTILS ?= "24 26"
+
+def bootstrap_modutils_depends(d):
+	import bb
+	m = bb.data.getVar('MODUTILS', d, 1)
+	r = []
+	if '24' in m:
+		r.append('modutils')
+	if '26' in m:
+		r.append('module-init-tools')
+	return ' '.join(r)
+
+def bootstrap_modutils_rdepends(d):
+	import bb
+        m = bb.data.getVar('MODUTILS', d, 1)
+        r = []
+	if '24' in m:
+                r.append('modutils-depmod')
+        if '26' in m:
+                r.append('module-init-tools-depmod')
+        return ' '.join(r)
+
+DEPENDS = 'base-files base-passwd-3.5.7 \
+	busybox dropbear hotplug initscripts modutils netbase \
+	sysvinit tinylogin portmap \
+	modutils-initscripts \
+	${BOOTSTRAP_EXTRA_DEPENDS} \
+	${@bootstrap_modutils_depends(d)}'
+
+RDEPENDS = 'base-files base-passwd busybox \
+	hotplug initscripts \
+	netbase sysvinit tinylogin \
+	modutils-initscripts \
+	${BOOTSTRAP_EXTRA_RDEPENDS} \
+	${@bootstrap_modutils_rdepends(d)}'
+
+RRECOMMENDS = 'dropbear portmap \
+	${BOOTSTRAP_EXTRA_RRECOMMENDS}'