From 9fd8c03e9fd067945788df170fc43677e48b9dfd Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sat, 25 Feb 2006 22:08:45 +0000 Subject: unslung-image: add kernel and update-modules to the IPKG list - kernel and update-modules must be in the IPKG list even though they are subsequently deleted so that they are cataloged in the ipkg database for dependency purposes. --- packages/meta/unslung-image.bb | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/packages/meta/unslung-image.bb b/packages/meta/unslung-image.bb index 003d348f25..caedab6b48 100644 --- a/packages/meta/unslung-image.bb +++ b/packages/meta/unslung-image.bb @@ -1,5 +1,5 @@ LICENSE = MIT -PR = "r11" +PR = "r12" IMAGE_BASENAME = "unslung" @@ -9,11 +9,11 @@ USE_DEVFS = "1" DEPENDS = "virtual/kernel \ ${UNSLUNG_EXTRA_DEPENDS}" -RDEPENDS = "kernel unslung-rootfs \ +RDEPENDS = "kernel update-modules unslung-rootfs \ libc6-unslung slingbox ipkg cpio findutils \ ${UNSLUNG_EXTRA_RDEPENDS}" -IPKG_INSTALL = "unslung-rootfs \ +IPKG_INSTALL = "kernel update-modules unslung-rootfs \ libc6-unslung slingbox ipkg cpio findutils \ ${UNSLUNG_EXTRA_INSTALL}" @@ -23,19 +23,28 @@ inherit image_ipk # Note that anything in this function must be repeatable without having to rebuild the rootfs unslung_clean_image () { + # Remove the patches rm -rf ${IMAGE_ROOTFS}/patches + # Remove the kernel image rm -rf ${IMAGE_ROOTFS}/boot + # And remove the post and pre scripts for the kernel; saves flash space + rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/kernel.postinst + rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/kernel.postrm + # Remove info from the local feed used to build the image rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/lists/* rm -f ${IMAGE_ROOTFS}/${sysconfdir}/version + # Tidy up some thing which are in the wrong place mv ${IMAGE_ROOTFS}${libdir}/libipkg* ${IMAGE_ROOTFS}/lib/ + # Remove the ipkg symlink - unsling puts it back in rm -f ${IMAGE_ROOTFS}${bindir}/ipkg # and make the ipkg symlink point to the ipkg-fl utility instead. ln -s ipkg-fl ${IMAGE_ROOTFS}${bindir}/ipkg + # Hack out the modutils stuff - it's too hard to make it work rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/update-modules.postinst rm -rf ${IMAGE_ROOTFS}/etc/rcS.d @@ -45,6 +54,8 @@ unslung_clean_image () { echo "#!/bin/sh" > ${IMAGE_ROOTFS}/sbin/depmod echo "exit 0" >> ${IMAGE_ROOTFS}/sbin/depmod chmod ugo+x ${IMAGE_ROOTFS}/sbin/depmod + + # Strip symbols and fix permissions on the libgcc_s.so.1 library ${STRIP} ${IMAGE_ROOTFS}/lib/libgcc_s.so.1 chmod ugo+x ${IMAGE_ROOTFS}/lib/libgcc_s.so.1 -- cgit v1.2.3