diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2008-12-29 15:34:49 +0100 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2008-12-29 15:34:49 +0100 |
| commit | 64b7045786320e8358e35de3f527ef7c8b371e0d (patch) | |
| tree | a2deb4ba4fec676e07f455ec0fd654056038cb8f | |
| parent | d09b2cff5e8b216f4d0e0c5b352fc51c7ddf84a5 (diff) | |
| parent | ab544a8f413a57d9052e7c998b002d12c272ec2d (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
| -rw-r--r-- | packages/angstrom/angstrom-feed-configs.bb | 55 |
1 files changed, 34 insertions, 21 deletions
diff --git a/packages/angstrom/angstrom-feed-configs.bb b/packages/angstrom/angstrom-feed-configs.bb index ff8f3c180d..3943d05502 100644 --- a/packages/angstrom/angstrom-feed-configs.bb +++ b/packages/angstrom/angstrom-feed-configs.bb @@ -1,7 +1,9 @@ DESCRIPTION = "Configuration files for online package repositories aka feeds" +RRECOMMENDS_${PN} += "opkg-nogpg" + #PV = "${DISTRO_VERSION}" -PR = "r7" +PR = "r8" PACKAGE_ARCH = "${MACHINE_ARCH}" FEED_BASEPATH ?= "unstable/feed/" @@ -9,16 +11,25 @@ FEED_BASEPATH ?= "unstable/feed/" IWMMXT_FEED = "${@base_contains('MACHINE_FEATURES', 'iwmmxt', 'iwmmxt', '',d)}" do_compile() { - mkdir -p ${S}/${sysconfdir}/opkg + mkdir -p ${S}/${sysconfdir}/opkg + + rm ${S}/${sysconfdir}/opkg/arch.conf || true + ipkgarchs="${PACKAGE_ARCHS}" + priority=1 + for arch in $ipkgarchs; do + echo "arch $arch $priority" >> ${S}/${sysconfdir}/opkg/arch.conf + priority=$(expr $priority + 5) + done + for feed in base debug perl python gstreamer ; do - echo "src/gz ${feed} ${ANGSTROM_URI}/${FEED_BASEPATH}${FEED_ARCH}/${feed}" > ${S}/${sysconfdir}/opkg/${feed}-feed.conf + echo "src/gz ${feed} ${ANGSTROM_URI}/${FEED_BASEPATH}${FEED_ARCH}/${feed}" > ${S}/${sysconfdir}/opkg/${feed}-feed.conf done - echo "src/gz ${MACHINE_ARCH} ${ANGSTROM_URI}/${FEED_BASEPATH}${FEED_ARCH}/machine/${MACHINE_ARCH}" > ${S}/${sysconfdir}/opkg/${MACHINE_ARCH}-feed.conf + echo "src/gz ${MACHINE_ARCH} ${ANGSTROM_URI}/${FEED_BASEPATH}${FEED_ARCH}/machine/${MACHINE_ARCH}" > ${S}/${sysconfdir}/opkg/${MACHINE_ARCH}-feed.conf echo "src/gz no-arch ${ANGSTROM_URI}/${FEED_BASEPATH}/all" > ${S}/${sysconfdir}/opkg/noarch-feed.conf - + # iwmmxt is a special case, add the iwmmxt feed for machine that have 'iwmmxt' in MACHINE_FEATURES - if [ "${IWMMXT_FEED}" = "iwmmxt" ] ; then + if [ "${IWMMXT_FEED}" = "iwmmxt" ] ; then echo "src/gz iwmmxt ${ANGSTROM_URI}/${FEED_BASEPATH}iwmmxt/base" > ${S}/${sysconfdir}/opkg/iwmmxt-feed.conf fi @@ -35,23 +46,25 @@ do_install () { } FILES_${PN} = "${sysconfdir}/opkg/base-feed.conf \ - ${sysconfdir}/opkg/debug-feed.conf \ - ${sysconfdir}/opkg/perl-feed.conf \ - ${sysconfdir}/opkg/python-feed.conf \ - ${sysconfdir}/opkg/gstreamer-feed.conf \ - ${sysconfdir}/opkg/${MACHINE_ARCH}-feed.conf \ - ${sysconfdir}/opkg/noarch-feed.conf \ - ${sysconfdir}/opkg/iwmmxt-feed.conf \ - " + ${sysconfdir}/opkg/debug-feed.conf \ + ${sysconfdir}/opkg/perl-feed.conf \ + ${sysconfdir}/opkg/python-feed.conf \ + ${sysconfdir}/opkg/gstreamer-feed.conf \ + ${sysconfdir}/opkg/${MACHINE_ARCH}-feed.conf \ + ${sysconfdir}/opkg/noarch-feed.conf \ + ${sysconfdir}/opkg/iwmmxt-feed.conf \ + ${sysconfdir}/opkg/arch.conf \ + " CONFFILES_${PN} += "${sysconfdir}/opkg/base-feed.conf \ - ${sysconfdir}/opkg/debug-feed.conf \ - ${sysconfdir}/opkg/perl-feed.conf \ - ${sysconfdir}/opkg/python-feed.conf \ - ${sysconfdir}/opkg/gstreamer-feed.conf \ - ${sysconfdir}/opkg/${MACHINE_ARCH}-feed.conf \ - ${sysconfdir}/opkg/noarch-feed.conf \ - " + ${sysconfdir}/opkg/debug-feed.conf \ + ${sysconfdir}/opkg/perl-feed.conf \ + ${sysconfdir}/opkg/python-feed.conf \ + ${sysconfdir}/opkg/gstreamer-feed.conf \ + ${sysconfdir}/opkg/${MACHINE_ARCH}-feed.conf \ + ${sysconfdir}/opkg/noarch-feed.conf \ + ${sysconfdir}/opkg/arch.conf \ + " python populate_packages_prepend () { etcdir = bb.data.expand('${sysconfdir}/opkg', d) |