summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@nslu2-linux.org>2005-09-06 08:03:41 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-09-06 08:03:41 +0000
commitc09f18c82f67c6db495008470508e939f56f1fed (patch)
treed0288b71c11ce1817d2a1c5f27b85611958f4a0e /conf
parentf749482065eb58bd8d9390a4231f65e56c181d1c (diff)
ucslugc: Add upslug2-native to the UcSlugC build
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/ucslugc-packages.conf1
-rw-r--r--conf/distro/ucslugc.conf15
2 files changed, 11 insertions, 5 deletions
diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf
index a45c396c8b..d17b059724 100644
--- a/conf/distro/ucslugc-packages.conf
+++ b/conf/distro/ucslugc-packages.conf
@@ -147,6 +147,7 @@ ${PKGDIR}/packages/uclibc/*.bb \
${PKGDIR}/packages/unionfs/*.bb \
${PKGDIR}/packages/update-modules/*.bb \
${PKGDIR}/packages/update-rc.d/*.bb \
+${PKGDIR}/packages/upslug/*.bb \
${PKGDIR}/packages/util-linux/*.bb \
${PKGDIR}/packages/vlan/*.bb \
${PKGDIR}/packages/wakelan/*.bb \
diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf
index 9239e676c7..b71352d070 100644
--- a/conf/distro/ucslugc.conf
+++ b/conf/distro/ucslugc.conf
@@ -108,12 +108,17 @@ IMAGE_PREPROCESS_COMMAND = "rm ${IMAGE_ROOTFS}/boot/zImage*;"
# the flash file system ('turnup' will not work). You need to add the filesystem
# modules for your chosen root file system (and any others which will be used).
# See openslug.conf for a more full-featured system!
-UCLIBC_EXTRA_RDEPENDS ?= ""
-UCLIBC_EXTRA_DEPENDS ?= ""
-#UCLIBC_EXTRA_BBFILES above may also need to be set
+UCSLUGC_EXTRA_RDEPENDS ?= ""
+UCSLUGC_EXTRA_DEPENDS ?= ""
+#USLUGC_EXTRA_BBFILES above may also need to be set
-OPENSLUG_EXTRA_INSTALL = "${UCLIBC_EXTRA_RDEPENDS}"
-OPENSLUG_EXTRA_DEPENDS = "${UCLIBC_EXTRA_DEPENDS}"
+# These depends define native utilities - they do not get put in the flash.
+# upslug2 (in tmp/work/upslug2-native-*) is the program to write the NSLU2 flash
+# Override this as desired - it makes no difference to the final image.
+UCSLUGC_NATIVE_DEPENDS ?= "upslug2-native"
+
+OPENSLUG_EXTRA_INSTALL = "${UCSLUGC_EXTRA_RDEPENDS}"
+OPENSLUG_EXTRA_DEPENDS = "${UCSLUGC_EXTRA_DEPENDS} ${UCSLUGC_NATIVE_DEPENDS}"
#----------------------------------------------------------------------------------
# PACKAGE VERSION CONTROL