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

into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2004/09/30 14:36:01+02:00 dyndns.org!reenoo
sablevm-classpath: don't use hardcoded paths in FILES

2004/09/30 05:40:43+02:00 local!CoreDump
Fixed EXCLUDE_FROM_FEED in split_ipk_feeds.oeclass

2004/09/30 00:14:27+02:00 dyndns.org!reenoo
Merge bk://openembedded@openembedded.bkbits.net/packages
into sugarcube.dyndns.org:/home2/oe/oe/packages

2004/09/30 00:13:52+02:00 dyndns.org!reenoo
Add xbase-clients meta package

2004/09/29 18:20:21+02:00 local!CoreDump
Merge bk://openembedded@openembedded.bkbits.net/packages
into mhcln01.hentges.local:/home/mhentges/OpenEmbedded/packages

2004/09/29 18:19:40+02:00 local!CoreDump
Update 1.1.6 translations

BKrev: 415c1917KE_kV42RiNRt_9gncHbCxg

diff --git a/classes/split_ipk_feeds.oeclass b/classes/split_ipk_feeds.oeclass
index e69de29..8a7c89c 100644 (file)
--- a/classes/split_ipk_feeds.oeclass
+++ b/classes/split_ipk_feeds.oeclass
@@ -0,0 +1,49 @@
+#
+# Splits packages into feeds, depending on the "Section" entry in "Packages"
+#
+
+
+die () {
+       echo "split_feed: ERROR: $1"
+       exit 1
+}
+
+do_split_feed () {
+       test -z "$FEED_PATTERN" && die "No feed pattern in FEED_PATTERN"
+       test -z "$FEED_NAME" && die "No feed name in FEED_NAME"
+       ! test -e ${DEPLOY_DIR_IPK}/Packages && die "[$DEPLOY_DIR_IPK/Packages] not found"
+       
+       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        
+
+       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
+       fi
+       
+       if ! test -d ${DEPLOY_DIR_IPK}/${FEED_NAME}
+       then
+               mkdir ${DEPLOY_DIR_IPK}/${FEED_NAME}
+       else            
+               test "${DEPLOY_DIR_IPK}/${FEED_NAME}" = "/" && die "EMERGENCY BAIL-OUT"
+               rm -rf ${DEPLOY_DIR_IPK}/${FEED_NAME}
+               mkdir ${DEPLOY_DIR_IPK}/${FEED_NAME}
+       fi      
+       
+       for package in `cat feed-content.tmp`
+       do
+               cp ${DEPLOY_DIR_IPK}/${package}_*.ipk ${DEPLOY_DIR_IPK}/${FEED_NAME}
+       done
+       
+       touch ${DEPLOY_DIR_IPK}/${FEED_NAME}/Packages
+       ipkg-make-index -r ${DEPLOY_DIR_IPK}/${FEED_NAME}/Packages -p ${DEPLOY_DIR_IPK}/${FEED_NAME}/Packages -l ${DEPLOY_DIR_IPK}/${FEED_NAME}/Packages.filelist -m ${DEPLOY_DIR_IPK}/${FEED_NAME}
+       
+       test -d ${DEPLOY_DIR_IPK}/${FEED_NAME}/morgue && rm -rf ${DEPLOY_DIR_IPK}/${FEED_NAME}/morgue
+}
+       
+addtask split_feed before do_build 
+

diff --git a/meta/oz-system-feed.oe b/meta/oz-system-feed.oe
index e69de29..e0a5de0 100644 (file)
--- a/meta/oz-system-feed.oe
+++ b/meta/oz-system-feed.oe
@@ -0,0 +1,16 @@
+
+# A dependency isn't really needed. Just build meta-? or even world
+# and build the feed afterwards.
+
+#DEPENDS = "meta-opie"
+
+# egrep -i Pattern matched against "$Section $Package-Name"
+export FEED_PATTERN = "\ locale-|glibc-"
+export FEED_NAME = "openzaurus-system"
+
+# egrep -i regexp matching package name
+export EXCLUDE_FROM_FEED = ""
+
+inherit split_ipk_feeds
+
+

diff --git a/meta/xbase-clients.oe b/meta/xbase-clients.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/opie-i18n/opie-i18n_1.1.6.oe b/opie-i18n/opie-i18n_1.1.6.oe
index 049d0b9..4c021af 100644 (file)
--- a/opie-i18n/opie-i18n_1.1.6.oe
+++ b/opie-i18n/opie-i18n_1.1.6.oe
@@ -5,8 +5,8 @@ MAINTAINER = "Team Opie <opie@handhelds.org>
 LICENSE = "GPL"
 DEPENDS = "opie-lrelease-native"
 
-PR = "r1"
-CVSDATE = "20040923"
+PR = "r2"
+CVSDATE = "20040926"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/i18n \
           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/etc/dict"

diff --git a/sablevm/sablevm-classpath_1.1.6.oe b/sablevm/sablevm-classpath_1.1.6.oe
index cd87ab2..7cc23db 100644 (file)
--- a/sablevm/sablevm-classpath_1.1.6.oe
+++ b/sablevm/sablevm-classpath_1.1.6.oe
@@ -12,5 +12,5 @@ inherit autotools
 
 PACKAGES += " ${PN}-native"
 
-FILES_${PN} = "/usr/share/sablevm"
-FILES_${PN}-native = "/usr/lib/sablevm"
+FILES_${PN} = "${datadir}/sablevm"
+FILES_${PN}-native = "${libdir}/sablevm"