summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-02-20 08:02:34 +0000
committerKoen Kooi <koen@openembedded.org>2007-02-20 08:02:34 +0000
commit23ad6c5fc6e8a79fecf6b926fa4e42e8887f28ff (patch)
tree0830e88627e25d54ab823e6a50fdf6c461b88ac4
parentf159eb4b635e0460f96eb1202780a2e7275bd3cb (diff)
package_ipk, rootfs_ipk: Add patch from Marcin and Koen to sort ipkgs into per architecture subdirs of deploy/ipk
see: http://lists.linuxtogo.org/pipermail/openembedded-devel/2007-February/001462.html
-rw-r--r--classes/package_ipk.bbclass3
-rw-r--r--classes/rootfs_ipk.bbclass31
2 files changed, 27 insertions, 7 deletions
diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass
index 4c14409b9d..70bcdf6b7f 100644
--- a/classes/package_ipk.bbclass
+++ b/classes/package_ipk.bbclass
@@ -75,6 +75,9 @@ python do_package_ipk () {
if not outdir:
bb.error("DEPLOY_DIR_IPK not defined, unable to package")
return
+
+ arch = bb.data.getVar('PACKAGE_ARCH', d, 1)
+ outdir = "%s/%s" % (outdir, arch)
bb.mkdirhier(outdir)
dvar = bb.data.getVar('D', d, 1)
diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index 03ba5f86b7..6fc7d8d133 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -18,17 +18,34 @@ fakeroot rootfs_ipk_do_rootfs () {
mkdir -p ${IMAGE_ROOTFS}/dev
- if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then
- touch ${DEPLOY_DIR_IPK}/Packages
- ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK}
- fi
- mkdir -p ${T}
- echo "src oe file:${DEPLOY_DIR_IPK}" > ${T}/ipkg.conf
ipkgarchs="${PACKAGE_ARCHS}"
- priority=1
+
+ if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then
+ touch ${DEPLOY_DIR_IPK}/Packages
+ ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK}
+ fi
+
for arch in $ipkgarchs; do
+ if [ -z "${DEPLOY_KEEP_PACKAGES}" ]; then
+ if [ -e ${DEPLOY_DIR_IPK}/$arch/ ] ; then
+ touch ${DEPLOY_DIR_IPK}/$arch/Packages
+ ipkg-make-index -r ${DEPLOY_DIR_IPK}/$arch/Packages -p ${DEPLOY_DIR_IPK}/$arch/Packages -l ${DEPLOY_DIR_IPK}/$arch/Packages.filelist -m ${DEPLOY_DIR_IPK}/$arch/
+ fi
+ fi
+ done
+
+ mkdir -p ${T}
+ priority=1
+
+ #Add deploy/ipk as well for backward compat
+ echo "src oe file:${DEPLOY_DIR_IPK}" > ${T}/ipkg.conf
+
+ for arch in $ipkgarchs; do
echo "arch $arch $priority" >> ${T}/ipkg.conf
priority=$(expr $priority + 5)
+ if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then
+ echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${T}/ipkg.conf
+ fi
done
ipkg-cl ${IPKG_ARGS} update
if [ ! -z "${LINGUAS_INSTALL}" ]; then