Merge bk://openembedded@openembedded.bkbits.net/packages

into handhelds.org:/home/mhentges/OpenEmbedded/packages

2004/10/17 18:38:30+02:00 handhelds.org!CoreDump
Add a 1.1.6.oe of opie-brightnessapplet to unbork builds with 3.5.1.conf

2004/10/17 15:40:39+02:00 handhelds.org!CoreDump
opie-i18n fixes. Add support für section filters in EXCLUDE_FROM_FEED & update feeds for oeclass changes

BKrev: 4173132bbUzC9ED19WB6rKtDa4MV4A

9 files changed, 29 insertions, 8 deletions

diff --git a/classes/split_ipk_feeds.oeclass b/classes/split_ipk_feeds.oeclass
index 9306d8a225..dd761f8246 100644
--- a/classes/split_ipk_feeds.oeclass
+++ b/classes/split_ipk_feeds.oeclass
@@ -20,13 +20,15 @@ do_split_feed () {
 	echo "Working on pattern [$FEED_PATTERN] for feed [$FEED_NAME]"
 	
 	# Don't we all love sed?
-	cat "${DEPLOY_DIR_IPK}/Packages" |sed -n "/^Section/s/Section\:\ //p;/^Package/s/Package\:\ //p" |sed '$!N;s/\n/ /;s/\(.*\)\ \(.*\)/\2 \1/'| sort | egrep -i -- "$FEED_PATTERN" | sed -n "s/\(.*\)\ \(.*\)/\2/p" > feed-content.tmp	
+	cat "${DEPLOY_DIR_IPK}/Packages" |sed -n "/^Section/s/Section\:\ //p;/^Package/s/Package\:\ //p" |sed '$!N;s/\n/ /;s/\(.*\)\ \(.*\)/\2 \1/'| sort | egrep -i -- "$FEED_PATTERN" > feed-content.tmp	
 
 	if ! test -z "$EXCLUDE_FROM_FEED"
 	then
-		cat feed-content.tmp | egrep -iv -- "$EXCLUDE_FROM_FEED" > feed-content.tmp2
-		rm feed-content.tmp ; mv feed-content.tmp2 feed-content.tmp
+		cat feed-content.tmp | egrep -iv -- "$EXCLUDE_FROM_FEED" | sed -n "s/\(.*\)\ \(.*\)/\2/p" > feed-content.tmp2		
+	else
+		cat feed-content.tmp | sed -n "s/\(.*\)\ \(.*\)/\2/p" > feed-content.tmp2
 	fi
+	rm feed-content.tmp ; mv feed-content.tmp2 feed-content.tmp
 	
 	if ! test -d ${DEPLOY_DIR_IPK}/${FEED_NAME}
 	then
diff --git a/meta/gpe-feed.oe b/meta/gpe-feed.oe
index e69de29bb2..cd132b0f9c 100644
--- a/meta/gpe-feed.oe
+++ b/meta/gpe-feed.oe
@@ -0,0 +1,14 @@
+
+# A dependency isn't really needed. Just build meta-opie or even world
+# and build the feed afterwards.
+
+#DEPENDS = "meta-gpe"
+
+# egrep -i Pattern matched against "$Section $Package-Name"
+export FEED_PATTERN = "^gpe|^x11"
+export FEED_NAME = "gpe"
+
+# egrep -i Pattern matched against "$Section $Package-Name"
+export EXCLUDE_FROM_FEED = "-dev$"
+
+inherit split_ipk_feeds
diff --git a/meta/opie-feed.oe b/meta/opie-feed.oe
index dd263d5313..981ef074d3 100644
--- a/meta/opie-feed.oe
+++ b/meta/opie-feed.oe
@@ -8,8 +8,8 @@
 export FEED_PATTERN = "^opie"
 export FEED_NAME = "opie"
 
-# egrep -i regexp matching package name
-export EXCLUDE_FROM_FEED = "-dev$"
+# egrep -i Pattern matched against "$Section $Package-Name"
+export EXCLUDE_FROM_FEED = "-dev$|translations "
 inherit split_ipk_feeds
 
 
diff --git a/meta/opie-locale-feed.oe b/meta/opie-locale-feed.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/meta/opie-locale-feed.oe
diff --git a/meta/oz-feed.oe b/meta/oz-feed.oe
index 8b0ef3b666..e526a36765 100644
--- a/meta/oz-feed.oe
+++ b/meta/oz-feed.oe
@@ -8,7 +8,7 @@
 export FEED_PATTERN = "^console|^libs|^base"
 export FEED_NAME = "openzaurus"
 
-# egrep -i regexp matching package name
-export EXCLUDE_FROM_FEED = "^locale-|^glibc-|-dev$"
+# egrep -i Pattern matched against "$Section $Package-Name"
+export EXCLUDE_FROM_FEED = " locale-| glibc-|-dev$"
 
 inherit split_ipk_feeds
diff --git a/meta/oz-system-feed.oe b/meta/oz-system-feed.oe
index 75c38d5198..b393f29f1d 100644
--- a/meta/oz-system-feed.oe
+++ b/meta/oz-system-feed.oe
@@ -8,7 +8,7 @@
 export FEED_PATTERN = "\ locale-|glibc-|-dev$|devel"
 export FEED_NAME = "openzaurus-system"
 
-# egrep -i regexp matching package name
+# egrep -i Pattern matched against "$Section $Package-Name"
 export EXCLUDE_FROM_FEED = ""
 
 inherit split_ipk_feeds
diff --git a/opie-brightnessapplet/opie-brightnessapplet_1.1.6.oe b/opie-brightnessapplet/opie-brightnessapplet_1.1.6.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/opie-brightnessapplet/opie-brightnessapplet_1.1.6.oe
diff --git a/opie-zkbapplet/opie-zkbapplet_1.1.6.oe b/opie-zkbapplet/opie-zkbapplet_1.1.6.oe
index 8f510efa10..66e5b9c6dc 100644
--- a/opie-zkbapplet/opie-zkbapplet_1.1.6.oe
+++ b/opie-zkbapplet/opie-zkbapplet_1.1.6.oe
@@ -4,10 +4,13 @@ PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 
+I18N_FILES = "keyz-cfg.ts"
 APPNAME = "zkbapplet"
 RDEPENDS = "opie-pics"
 PR = "r1"
 
+CVSDATE = "20041015"
+
 TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/applets/zkbapplet \
            cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/share \
diff --git a/opie-zkbapplet/opie-zkbapplet_cvs.oe b/opie-zkbapplet/opie-zkbapplet_cvs.oe
index a88265145c..55b5a4dffc 100644
--- a/opie-zkbapplet/opie-zkbapplet_cvs.oe
+++ b/opie-zkbapplet/opie-zkbapplet_cvs.oe
@@ -6,6 +6,8 @@ LICENSE = "GPL"
 PV = "1.1.6+cvs-${CVSDATE}"
 APPNAME = "zkbapplet"
 RDEPENDS = "opie-pics"
+I18N_FILES = "keyz-cfg.ts"
+
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/applets/zkbapplet \
            cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/share \