diff options
| author | Jeremy Laine <jeremy.laine@m4x.org> | 2007-12-01 12:28:00 +0000 |
|---|---|---|
| committer | Jeremy Laine <jeremy.laine@m4x.org> | 2007-12-01 12:28:00 +0000 |
| commit | d1c721fb8d1c2511c72d8269b97c3cd044062cff (patch) | |
| tree | e4b48ad474b11391bb3ae7b5746d9e0abd783c68 | |
| parent | 4a1cf80f0abae3e9b9376e7ee21bfca9727c502d (diff) | |
| parent | a9c420400fef41620ba25fa8a3ae3c4cbc7751ae (diff) | |
merge of 'b67fa447ea540c7174493e27cff5886f3f4ee90d'
and 'f22535c96dd5d39ae39d98a069d0f7fa5ebb4ace'
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 6 | ||||
| -rw-r--r-- | conf/distro/angstrom-2008.1.conf | 4 | ||||
| -rw-r--r-- | packages/angstrom/angstrom-feed-configs.bb | 5 | ||||
| -rw-r--r-- | packages/images/nslu2-minimal-image.bb | 2 |
4 files changed, 15 insertions, 2 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index bba0891ecf..84077594af 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -29,6 +29,7 @@ DISTRO_TYPE ?= "debug" # Also, it appears that no locales fit in 16Mb for now. "C" locale rules! IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-gb", d)}' +# These will be put under package management soon FEED_URIS += " \ no-arch##${ANGSTROM_URI}/unstable/feed/all \ base##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/base \ @@ -41,6 +42,11 @@ FEED_URIS += " \ # ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/machine/${MACHINE} \ # updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${FEED_ARCH}/updates" + +# set feed path variables +FEED_BASEPATH = "feeds/2007/${ANGSTROM_PKG_FORMAT}/${ANGSTROM_MODE}/" + + #The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback CVS_TARBALL_STASH ?= "\ http://www.angstrom-distribution.org/unstable/sources/ \ diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 9614581ffc..0159c7dd0b 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -44,6 +44,10 @@ FEED_URIS += " \ gstreamer##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/gstreamer \ ${MACHINE}##${ANGSTROM_URI}/unstable/feed/${FEED_ARCH}/machine/${MACHINE}" +# set feed path variables +FEED_BASEPATH = "feeds/2008/${ANGSTROM_PKG_FORMAT}/${ANGSTROM_MODE}/" + + #The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback CVS_TARBALL_STASH ?= "\ http://www.angstrom-distribution.org/unstable/sources/ \ diff --git a/packages/angstrom/angstrom-feed-configs.bb b/packages/angstrom/angstrom-feed-configs.bb index 6730b6a044..9d94747179 100644 --- a/packages/angstrom/angstrom-feed-configs.bb +++ b/packages/angstrom/angstrom-feed-configs.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Configuration files for online package repositories aka feeds" -PR = "1" +#PV = "${DISTRO_VERSION}" +PR = "r2" PACKAGE_ARCH = "${MACHINE_ARCH}" FEED_BASEPATH ?= "unstable/feed/" @@ -11,7 +12,7 @@ do_compile() { echo "src/gz ${feed} ${ANGSTROM_URI}/${FEED_BASEPATH}${FEED_ARCH}/${feed}" > ${S}/${sysconfdir}/ipkg/${feed}-feed.conf done - echo "src/gz ${MACHINE_ARCH} ${ANGSTROM_URI}/${FEED_BASEPATH}${FEED_ARCH}/${MACHINE_ARCH}" > ${S}/${sysconfdir}/ipkg/${MACHINE_ARCH}-feed.conf + echo "src/gz ${MACHINE_ARCH} ${ANGSTROM_URI}/${FEED_BASEPATH}${FEED_ARCH}/machine/${MACHINE_ARCH}" > ${S}/${sysconfdir}/ipkg/${MACHINE_ARCH}-feed.conf echo "src/gz no-arch ${ANGSTROM_URI}/${FEED_BASEPATH}/all" > ${S}/${sysconfdir}/ipkg/noarch-feed.conf } diff --git a/packages/images/nslu2-minimal-image.bb b/packages/images/nslu2-minimal-image.bb index c410707a31..071fc67c08 100644 --- a/packages/images/nslu2-minimal-image.bb +++ b/packages/images/nslu2-minimal-image.bb @@ -1,3 +1,5 @@ require minimal-image.bb +export IMAGE_BASENAME = "nslu2-minimalist-image" + inherit nslu2-image |