Patchwork distro-feed-configs: use ${FEED_ARCH} instead of ${PACKAGE_EXTRA_ARCHES} and bump PR

login
register
mail settings
Submitter Simon Busch
Date June 3, 2011, 5:18 p.m.
Message ID <1307121508-12200-1-git-send-email-morphis@gravedo.de>
Download mbox | patch
Permalink /patch/5381/
State New, archived
Headers show

Comments

Simon Busch - June 3, 2011, 5:18 p.m.
As the distro feed configs are already machine specific we don't need to include any other
target architecture than specified in ${FEED_ARCH}. Together with all and ${MACHINE_ARCH}
it's all we need to generate the feed package for the machine we build for.

This patch removes some unused code lines too and let bitbake only produce one package
named ${PN} as result. We don't need the -dbg, -dev, ... packages.

Signed-off-by: Simon Busch <morphis@gravedo.de>
---
 recipes/meta/distro-feed-configs.bb |   17 +++++------------
 1 files changed, 5 insertions(+), 12 deletions(-)

Patch

diff --git a/recipes/meta/distro-feed-configs.bb b/recipes/meta/distro-feed-configs.bb
index 2540af9..d2cc0a2 100644
--- a/recipes/meta/distro-feed-configs.bb
+++ b/recipes/meta/distro-feed-configs.bb
@@ -1,15 +1,16 @@ 
 DESCRIPTION = "Configuration files for online package repositories aka feeds"
-PR = "r1"
+PR = "r2"
 
 DISTRO_FEED_PREFIX ?= "remote"
 DISTRO_FEED_URI ?= "http://my-distribution.example/remote-feed/"
 
 do_compile() {
     mkdir -p ${S}/${sysconfdir}/opkg
-    for feed in all ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}; do
+    for feed in all ${FEED_ARCH} ${MACHINE_ARCH}; do
         echo "src/gz ${DISTRO_FEED_PREFIX}-${feed} ${DISTRO_FEED_URI}/${feed}" > ${S}/${sysconfdir}/opkg/${feed}-feed.conf
     done
 }
+
 do_install () {
         install -d ${D}${sysconfdir}/opkg
         install -m 0644 ${S}/${sysconfdir}/opkg/* ${D}${sysconfdir}/opkg/
@@ -17,14 +18,6 @@  do_install () {
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-#def distro_feed_configs(d):
-#    import bb
-#    parchs = bb.data.getVar( "PACKAGE_EXTRA_ARCHS", d, 1 ).split()
-#    march = bb.data.getVar( "MACHINE_ARCH", d, 1 ).split()
-#    archs = [ "all" ] + parchs + march
-#    confs = [ ( "${sysconfdir}/opkg/%s-feed.conf" % feed ) for feed in archs ]
-#    return " ".join( confs )
-#
-#CONFFILES_${PN} += '${@distro_feed_configs(d)}'
+PACKAGES = "${PN}"
 
-CONFFILES_${PN} += '${@ " ".join( [ ( "${sysconfdir}/opkg/%s-feed.conf" % feed ) for feed in "all ${PACKAGE_EXTRA_ARCHS} ${MACHINE_ARCH}".split() ] ) }'
+CONFFILES_${PN} += '${@ " ".join( [ ( "${sysconfdir}/opkg/%s-feed.conf" % feed ) for feed in "all ${FEED_ARCH} ${MACHINE_ARCH}".split() ] ) }'