Merge bk://openembedded@openembedded.bkbits.net/packages

into workhouse.nexus.co.uk:/home/pb/oe/oe-packages

2004/07/10 15:08:51+02:00 (none)!ich
Merge bk://openembedded@openembedded.bkbits.net/packages
into debian.(none):/home/ich/programming/oe/oe-packages-exported

2004/07/10 15:07:39+02:00 (none)!ich
Move zapping of passwords from gpe-image.oe to image_ipk.oeclass so that all images
can use this function.
Currently gpe uses it and in the opie-image.oe it is still commented out

BKrev: 40f00353lvCZEyW1qeOLzClEQDO2JQ

diff --git a/classes/image_ipk.oeclass b/classes/image_ipk.oeclass
index 7821aa6..f0fb5ec 100644 (file)
--- a/classes/image_ipk.oeclass
+++ b/classes/image_ipk.oeclass
@@ -69,4 +69,16 @@ EOF
                oeimage -t ${IMAGE_FSTYPE} -e ${FILE}
        fi
 }
+
+# set '*' as the rootpassword so the images
+# can decide if they want it or not
+
+zap_root_password () {
+       sed 's%^root:[^:]*:%root:*:%' < ${IMAGE_ROOTFS}/etc/passwd >${IMAGE_ROOTFS}/etc/passwd.new
+       mv ${IMAGE_ROOTFS}/etc/passwd.new ${IMAGE_ROOTFS}/etc/passwd    
+} 
+
+# export the zap_root_password
+EXPORT_FUNCTIONS zap_root_password
+
 addtask images before do_build after do_install

diff --git a/meta/gpe-image.oe b/meta/gpe-image.oe
index 04d830c..0b1c927 100644 (file)
--- a/meta/gpe-image.oe
+++ b/meta/gpe-image.oe
@@ -8,10 +8,6 @@ export IPKG_INSTALL = 'task-bootstrap xserver-kdrive-fbdev \
                      gpe ttf-bitstream-vera pango-module-basic-x pango-module-basic-fc \
                      glibc-gconv glibc-gconv-iso8859-1 gdk-pixbuf-loader-png'
 
-zap_root_password () {
-       sed 's%^root:[^:]*:%root:*:%' < ${IMAGE_ROOTFS}/etc/passwd >${IMAGE_ROOTFS}/etc/passwd.new
-       mv ${IMAGE_ROOTFS}/etc/passwd.new ${IMAGE_ROOTFS}/etc/passwd    
-}
 
 IMAGE_POSTPROCESS_COMMAND = "zap_root_password"
 

diff --git a/meta/opie-image.oe b/meta/opie-image.oe
index b785b8f..731d6aa 100644 (file)
--- a/meta/opie-image.oe
+++ b/meta/opie-image.oe
@@ -60,4 +60,8 @@ DEPENDS = "task-bootstrap ${OPIE_LIBS_DEPEND} ${OPIE_BASE} ${OPIE_BASE_APPLETS}
             ${OPIE_EXTRA_APPLETS} ${OPIE_EXTRA_SETTINGS} ${OPIE_EXTRA_APPS} \
             ${OPIE_BASE_STYLES} ${OPIE_BASE_DECOS} ${OPIE_BASE_INPUTMETHODS}"
 
+
+# zap the root password
+#IMAGE_POSTPROCESS_COMMAND = "zap_root_password"
+
 inherit image_ipk