diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2005-08-07 21:33:21 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-07 21:33:21 +0000 |
| commit | aed625f53496577a7e5f8ef50161e26148a4b918 (patch) | |
| tree | 549b30735bc1548607905177fc1d76dcb36890d8 /conf | |
| parent | 2a1348f4d4469c2a0cb820172c5762644652ace6 (diff) | |
| parent | ec4cc21941a1a0d791efe69c5c7fcfb0a14b117d (diff) | |
propagate from branch 'org.openembedded.dev' (head e5ee515fa896606518481b09699b0237741b79e7)
to branch 'org.openembedded.nslu2-linux' (head 9467bebba2440fba8a123b9cdcfe3ebfb3bbd4d1)
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/openslug-packages.conf | 2 | ||||
| -rw-r--r-- | conf/distro/ucslugc-packages.conf | 1 | ||||
| -rw-r--r-- | conf/distro/ucslugc.conf | 6 |
3 files changed, 9 insertions, 0 deletions
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf index 46f5b8babc..f1a031075c 100644 --- a/conf/distro/openslug-packages.conf +++ b/conf/distro/openslug-packages.conf @@ -26,6 +26,7 @@ ${PKGDIR}/packages/cyrus-sasl/*.bb \ ${PKGDIR}/packages/db/*.bb \ ${PKGDIR}/packages/devio/*.bb \ ${PKGDIR}/packages/diffutils/*.bb \ +${PKGDIR}/packages/diffstat/*.bb \ ${PKGDIR}/packages/dnsmasq/*.bb \ ${PKGDIR}/packages/dropbear/*.bb \ ${PKGDIR}/packages/e2fsprogs/*.bb \ @@ -144,6 +145,7 @@ ${PKGDIR}/packages/screen/*.bb \ ${PKGDIR}/packages/sed/*.bb \ ${PKGDIR}/packages/setpwc/*.bb \ ${PKGDIR}/packages/slugimage/*.bb \ +${PKGDIR}/packages/softdog/*.bb \ ${PKGDIR}/packages/strace/*.bb \ ${PKGDIR}/packages/streamripper/*.bb \ ${PKGDIR}/packages/sudo/*.bb \ diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf index b922ffe0b9..489b1c0112 100644 --- a/conf/distro/ucslugc-packages.conf +++ b/conf/distro/ucslugc-packages.conf @@ -26,6 +26,7 @@ ${PKGDIR}/packages/cyrus-imapd/*.bb \ ${PKGDIR}/packages/cyrus-sasl/*.bb \ ${PKGDIR}/packages/db/*.bb \ ${PKGDIR}/packages/devio/*.bb \ +${PKGDIR}/packages/diffstat/*.bb \ ${PKGDIR}/packages/diffutils/*.bb \ ${PKGDIR}/packages/dnsmasq/*.bb \ ${PKGDIR}/packages/dropbear/*.bb \ diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf index c321f18009..7eb8e2f9ad 100644 --- a/conf/distro/ucslugc.conf +++ b/conf/distro/ucslugc.conf @@ -61,6 +61,12 @@ EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 -D ${OPENSLUG_DE # issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf) CMDLINE_DEBUG = "noirqdebug" +# IMAGE_PREPROCESS_COMMAND is run before making the image. In UcSlugC the +# kernel image is removed from the root file system to recover the space used - +# UcSlugC is assumed to boot from a separate kernel image in flash (not in the +# root file system), if this is not the case the following must not be done! +IMAGE_PREPROCESS_COMMAND = "rm ${IMAGE_ROOTFS}/boot/zImage*;" + # EXTRA PACKAGES # -------------- # UcSlugC builds an openslug-image with no extra packages - to add packages to the |