summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-06-04 19:40:08 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-06-04 19:40:08 +0000
commit25c6441ff72fc6705fd44d85a374ab512fc0cbf8 (patch)
tree56527f7834288b3315a00ce6fbf52718370a70cf
parent092bc09c9986057c3dd16037eb03521f0a878667 (diff)
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/06/04 20:24:09+01:00 reciva.com!pb add gmp-native, needed by gcc 4.0.0 f95 2005/06/04 20:18:17+01:00 reciva.com!pb move hostname.sh a bit earlier in the boot order, so it runs before networking 2005/06/04 20:06:07+01:00 reciva.com!pb set ALLOW_EMPTY for kernel-image BKrev: 42a20398qt2Wd6KD6RthCSJg2TTGyA
-rw-r--r--classes/kernel.bbclass1
-rw-r--r--packages/gmp/gmp-native_4.1.2.bb0
-rw-r--r--packages/initscripts/initscripts_1.0.bb4
3 files changed, 3 insertions, 2 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index c80aa5f6a7..9dca8b2403 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -148,6 +148,7 @@ FILES_kernel-dev = "/boot/System.map* /boot/config*"
RDEPENDS_kernel = "kernel-image-${KERNEL_VERSION}"
PKG_kernel-image = "kernel-image-${KERNEL_VERSION}"
ALLOW_EMPTY_kernel = "1"
+ALLOW_EMPTY_kernel-image = "1"
pkg_postinst_modules () {
if [ -n "$D" ]; then
diff --git a/packages/gmp/gmp-native_4.1.2.bb b/packages/gmp/gmp-native_4.1.2.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gmp/gmp-native_4.1.2.bb
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index a42948ef02..003cfcb424 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
DEPENDS_openzaurus = "makedevs virtual/kernel"
RDEPENDS = "makedevs"
LICENSE = "GPL"
-PR = "r43"
+PR = "r44"
SRC_URI = "file://halt \
file://ramdisk \
@@ -125,7 +125,7 @@ do_install () {
ln -sf ../init.d/checkroot.sh ${D}${sysconfdir}/rcS.d/S10checkroot.sh
# ln -sf ../init.d/checkfs.sh ${D}${sysconfdir}/rcS.d/S30checkfs.sh
ln -sf ../init.d/mountall.sh ${D}${sysconfdir}/rcS.d/S35mountall.sh
- ln -sf ../init.d/hostname.sh ${D}${sysconfdir}/rcS.d/S40hostname.sh
+ ln -sf ../init.d/hostname.sh ${D}${sysconfdir}/rcS.d/S39hostname.sh
ln -sf ../init.d/mountnfs.sh ${D}${sysconfdir}/rcS.d/S45mountnfs.sh
ln -sf ../init.d/bootmisc.sh ${D}${sysconfdir}/rcS.d/S55bootmisc.sh
# ln -sf ../init.d/urandom ${D}${sysconfdir}/rcS.d/S55urandom