diff options
| -rw-r--r-- | conf/distro/nslu2-dist.conf | 1 | ||||
| -rw-r--r-- | conf/distro/ucslugc.conf | 18 |
2 files changed, 15 insertions, 4 deletions
diff --git a/conf/distro/nslu2-dist.conf b/conf/distro/nslu2-dist.conf index 94dada61c4..de6c8d9173 100644 --- a/conf/distro/nslu2-dist.conf +++ b/conf/distro/nslu2-dist.conf @@ -139,7 +139,6 @@ IMAGE_PREPROCESS_COMMAND = "rm ${IMAGE_ROOTFS}/boot/zImage*;" # See openslug.conf for a more full-featured system! NSLU2_EXTRA_RDEPENDS ?= "" NSLU2_EXTRA_DEPENDS ?= "" -#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 diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf index d349812932..fa3f1ba886 100644 --- a/conf/distro/ucslugc.conf +++ b/conf/distro/ucslugc.conf @@ -8,16 +8,28 @@ DISTRO_VERSION = "3-beta" DISTRO_FEED = "unstable" DISTRO_TYPE ?= "beta" +# Official UcSlugC feeds: +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}" + # 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}" +# For compatibility with the old way of overriding these settings names with the +# prefix UCSLUGC_ are used here to default the values of the corresponding NSLU2_ +# setting - either may be set in local.conf to override these values. +UCSLUGC_EXTRA_RDEPENDS ?= "" +UCSLUGC_EXTRA_DEPENDS ?= "" +UCSLUGC_NATIVE_DEPENDS ?= "upslug2-native" +# +NSLU2_EXTRA_RDEPENDS ?= "${UCSLUGC_EXTRA_RDEPENDS}" +NSLU2_EXTRA_DEPENDS ?= "${UCSLUGC_EXTRA_DEPENDS}" +NSLU2_NATIVE_DEPENDS ?= "${UCSLUGC_NATIVE_DEPENDS}" include conf/distro/nslu2-btu.conf #FIXME # This seems to be required with thumb. -PREFERRED_VERSION_samba ?= "3.0.14a" +#PREFERRED_VERSION_samba ?= "3.0.14a" |