summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/rootfs_ipk.bbclass13
-rw-r--r--conf/machine/nokia770.conf2
2 files changed, 13 insertions, 2 deletions
diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index 062c957359..2880411c31 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -130,7 +130,16 @@ create_etc_timestamp() {
date +%2m%2d%2H%2M%Y >${IMAGE_ROOTFS}/etc/timestamp
}
-# export the zap_root_password and create_etc_timestamp
-EXPORT_FUNCTIONS zap_root_password create_etc_timestamp
+# Turn any symbolic /sbin/init link into a file
+remove_init_link () {
+ if [ -h ${IMAGE_ROOTFS}/sbin/init ]; then
+ LINKFILE=${IMAGE_ROOTFS}`readlink ${IMAGE_ROOTFS}/sbin/init`
+ rm ${IMAGE_ROOTFS}/sbin/init
+ cp $LINKFILE ${IMAGE_ROOTFS}/sbin/init
+ fi
+}
+
+# export the zap_root_password, create_etc_timestamp and remote_init_link
+EXPORT_FUNCTIONS zap_root_password create_etc_timestamp remove_init_link
addtask rootfs before do_build after do_install
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index 8b657281c7..9f49f24563 100644
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -54,5 +54,7 @@ pcmcia-cs apm ppp wireless-tools console-tools"
#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage kernel-module-g-serial \
# kernel-module-g-ether"
+ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; "
+
include conf/machine/handheld-common.conf