summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/split_ipk_feeds.oeclass12
-rw-r--r--meta/opie-feed.oe15
-rw-r--r--meta/oz-feed.oe14
-rw-r--r--meta/oz-system-feed.oe2
4 files changed, 37 insertions, 6 deletions
diff --git a/classes/split_ipk_feeds.oeclass b/classes/split_ipk_feeds.oeclass
index 8a7c89cffa..2cf73a2717 100644
--- a/classes/split_ipk_feeds.oeclass
+++ b/classes/split_ipk_feeds.oeclass
@@ -16,22 +16,22 @@ 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" | 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
+ 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}
+ mkdir -p ${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}
+ mkdir -p ${DEPLOY_DIR_IPK}/${FEED_NAME}
fi
for package in `cat feed-content.tmp`
@@ -40,9 +40,11 @@ do_split_feed () {
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}
+ 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} || die "ipkg-make-index failed!" && echo "Packages done"
+ echo "###"
test -d ${DEPLOY_DIR_IPK}/${FEED_NAME}/morgue && rm -rf ${DEPLOY_DIR_IPK}/${FEED_NAME}/morgue
+ echo "###"
}
addtask split_feed before do_build
diff --git a/meta/opie-feed.oe b/meta/opie-feed.oe
index e69de29bb2..dd263d5313 100644
--- a/meta/opie-feed.oe
+++ b/meta/opie-feed.oe
@@ -0,0 +1,15 @@
+
+# A dependency isn't really needed. Just build meta-opie or even world
+# and build the feed afterwards.
+
+#DEPENDS = "meta-opie"
+
+# egrep -i Pattern matched against "$Section $Package-Name"
+export FEED_PATTERN = "^opie"
+export FEED_NAME = "opie"
+
+# egrep -i regexp matching package name
+export EXCLUDE_FROM_FEED = "-dev$"
+inherit split_ipk_feeds
+
+
diff --git a/meta/oz-feed.oe b/meta/oz-feed.oe
index e69de29bb2..a3145e2a75 100644
--- a/meta/oz-feed.oe
+++ b/meta/oz-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-opie"
+
+# egrep -i Pattern matched against "$Section $Package-Name"
+export FEED_PATTERN = "^net|^fonts|^libs|^base"
+export FEED_NAME = "openzaurus"
+
+# egrep -i regexp matching 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 e0a5de056c..48af4e6a3d 100644
--- a/meta/oz-system-feed.oe
+++ b/meta/oz-system-feed.oe
@@ -5,7 +5,7 @@
#DEPENDS = "meta-opie"
# egrep -i Pattern matched against "$Section $Package-Name"
-export FEED_PATTERN = "\ locale-|glibc-"
+export FEED_PATTERN = "\ locale-|glibc-|-dev$"
export FEED_NAME = "openzaurus-system"
# egrep -i regexp matching package name