diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2005-10-24 18:46:12 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-10-24 18:46:12 +0000 |
| commit | f2ea136f0de4797dbfb55213e5b7e5d866a029e5 (patch) | |
| tree | 01282fe71f345f6a20df3f0909d54bd1d4289c09 | |
| parent | dd6f6afd83f7c64f0252ce56e68fbb6069edfb73 (diff) | |
ucslugc: correct UCSLUG_EXTRA_BBFILES, damaged by change to nslu2-dist.conf in distro conf
| -rw-r--r-- | conf/distro/nslu2-dist.conf | 13 | ||||
| -rw-r--r-- | conf/distro/ucslugc.conf | 9 |
2 files changed, 12 insertions, 10 deletions
diff --git a/conf/distro/nslu2-dist.conf b/conf/distro/nslu2-dist.conf index 0482b8f8ff..94dada61c4 100644 --- a/conf/distro/nslu2-dist.conf +++ b/conf/distro/nslu2-dist.conf @@ -54,7 +54,7 @@ ARM_INTERWORK = "${NSLU2_INTERWORK}" # glib-2.0 builds require USE_NLS to be overridden USE_NLS_glib-2.0 = "yes" -INHERIT += " package_ipk debian" +INHERIT += "package_ipk debian" # The value of NSLU2_BASE_DISTRO is added to the OVERRIDES after the DISTRO, this # is set to 'openslug' to pick up the original openslug overrides. See @@ -66,11 +66,6 @@ NSLU2_BASE_DISTRO = ":openslug" # requires that instruction set support. PACKAGE_ARCH = "${NSLU2_PACKAGE_ARCH}" -# NOTE: to build new packages set NSLU2_EXTRA_BBFILES to the full path name to -# the .bb files for the packages to build - see ucslugc-packages.conf in this -# directory -NSLU2_EXTRA_BBFILES ?= "" - # pull in the frozen list of bbfiles - this sets BBFILES and this will override any # setting in local.conf Since this depends on ${DISTRO} it doesn't actually do # anything by default unless conf/distro/${DISTRO}-packages.conf exists. @@ -131,7 +126,7 @@ IMAGE_PREPROCESS_COMMAND = "rm ${IMAGE_ROOTFS}/boot/zImage*;" # *not* overwritten by a standard upslug upgrade, so you can make an image with # just non-LinkSys software which can be flashed into the NSLU2. -#INHERIT += " nslu2-jffs2-image" +#INHERIT += "nslu2-jffs2-image" # EXTRA PACKAGES # -------------- @@ -144,7 +139,7 @@ IMAGE_PREPROCESS_COMMAND = "rm ${IMAGE_ROOTFS}/boot/zImage*;" # See openslug.conf for a more full-featured system! NSLU2_EXTRA_RDEPENDS ?= "" NSLU2_EXTRA_DEPENDS ?= "" -#USLUGC_EXTRA_BBFILES above may also need to be set +#NSLU2_EXTRA_BBFILES above may also need to be set # 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 @@ -187,5 +182,3 @@ PREFERRED_VERSION_ixp400-eth ?= "1.4" # Select the smallest provider of x11 libraries PREFERRED_PROVIDER_x11 ?= "diet-x11" CVSDATE_diet-x11 ?= "20051005" - -PREFERRED_VERSION_samba ?= "3.0.14a" diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf index ae4b850f62..d349812932 100644 --- a/conf/distro/ucslugc.conf +++ b/conf/distro/ucslugc.conf @@ -8,7 +8,16 @@ DISTRO_VERSION = "3-beta" DISTRO_FEED = "unstable" DISTRO_TYPE ?= "beta" +# NOTE: to build new packages set UCSLUGC_EXTRA_BBFILES to the full path name to +# the .bb files for the packages to build - see ucslugc-packages.conf in this +# directory +UCSLUGC_EXTRA_BBFILES ?= "" + FEED_URIS_append += "cross##http://ipkg.nslu2-linux.org/feeds/ucslugc/cross/${DISTRO_FEED}" FEED_URIS_append += "native##http://ipkg.nslu2-linux.org/feeds/ucslugc/native/${DISTRO_FEED}" include conf/distro/nslu2-btu.conf + +#FIXME +# This seems to be required with thumb. +PREFERRED_VERSION_samba ?= "3.0.14a" |