From a780643c4b6aa11e1a36965a69df7116477c7b4c Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Tue, 7 Dec 2004 22:05:47 +0000 Subject: Merge oe-devel@oe-devel.bkbits.net:packages.bb into handhelds.org:/home/kergoth/code/packages.bb 2004/12/07 04:58:25-06:00 ti.com!kergoth More updates per the core rename. 2004/12/07 04:46:51-06:00 ti.com!kergoth Update soundtracker per the core rename. 2004/12/07 04:44:14-06:00 ti.com!kergoth Merge 2004/12/07 04:42:38-06:00 ti.com!kergoth Updates per the recent rename of the oe core from 'oe' to 'bitbake'. BKrev: 41b6293b91LRHSxMOt6WnrZVAdLbFw --- classes/image_ipk.bbclass | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 classes/image_ipk.bbclass (limited to 'classes/image_ipk.bbclass') diff --git a/classes/image_ipk.bbclass b/classes/image_ipk.bbclass new file mode 100644 index 0000000000..e69de29bb2 -- cgit v1.2.3 From 00f6a165aeeab027ba0361f2d9601cb359d73726 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 9 Dec 2004 01:08:40 +0000 Subject: More rename updates. BKrev: 41b7a598bGnuzf3sKWuCwtAE9oItIw --- classes/image_ipk.bbclass | 72 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) (limited to 'classes/image_ipk.bbclass') diff --git a/classes/image_ipk.bbclass b/classes/image_ipk.bbclass index e69de29bb2..0778114b4f 100644 --- a/classes/image_ipk.bbclass +++ b/classes/image_ipk.bbclass @@ -0,0 +1,72 @@ +inherit rootfs_ipk + +# Images are generally built explicitly, do not need to be part of world. +EXCLUDE_FROM_WORLD = "1" + +USE_DEVFS ?= "0" + +DEPENDS += "makedevs-native" + +def get_image_deps(d): + import bb + str = "" + for type in (bb.data.getVar('IMAGE_FSTYPES', d, 1) or "").split(): + deps = bb.data.getVar('IMAGE_DEPENDS_%s' % type, d) or "" + if deps: + str += " %s" % deps + return str + +DEPENDS += "${@get_image_deps(d)}" + +IMAGE_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-minimal.txt')}" +IMAGE_POSTPROCESS_COMMAND ?= "" + +# Must call real_do_rootfs() from inside here, rather than as a separate +# task, so that we have a single fakeroot context for the whole process. +fakeroot do_rootfs () { + set -x + rm -rf ${IMAGE_ROOTFS} + + if [ "${USE_DEVFS}" != "1" ]; then + mkdir -p ${IMAGE_ROOTFS}/dev + makedevs -r ${IMAGE_ROOTFS} -D ${IMAGE_DEVICE_TABLE} + fi + + real_do_rootfs + + insert_feed_uris + + rm ${IMAGE_ROOTFS}/usr/lib/ipkg/lists/oe + + ${IMAGE_PREPROCESS_COMMAND} + + export TOPDIR=${TOPDIR} + + for type in ${IMAGE_FSTYPES}; do + if test -z "$FAKEROOTKEY"; then + fakeroot -i ${TMPDIR}/fakedb.image oeimage -t $type -e ${FILE} + else + oeimage -n "${IMAGE_NAME}" -t "$type" -e "${FILE}" + fi + done + + ${IMAGE_POSTPROCESS_COMMAND} +} + +insert_feed_uris () { + + echo "Building feeds for [${DISTRO}].." + + for line in ${FEED_URIS} + do + # strip leading and trailing spaces/tabs, then split into name and uri + line_clean="`echo "$line"|sed 's/^[ \t]*//;s/[ \t]*$//'`" + feed_name="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\1/p'`" + feed_uri="`echo "$line_clean" | sed -n 's/\(.*\)##\(.*\)/\2/p'`" + + echo "Added $feed_name feed with URL $feed_uri" + + # insert new feed-sources + echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg/${feed_name}-feed.conf + done +} -- cgit v1.2.3 From 101e2f1623def0a355d20aacb8bd93810703e834 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 9 Dec 2004 09:36:34 +0000 Subject: s/oeimage/bbimage/ in the image_ipk class BKrev: 41b81ca2iYzoKlK2xhhbFYHWOt_MAQ --- classes/image_ipk.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'classes/image_ipk.bbclass') diff --git a/classes/image_ipk.bbclass b/classes/image_ipk.bbclass index 0778114b4f..f2a1180e97 100644 --- a/classes/image_ipk.bbclass +++ b/classes/image_ipk.bbclass @@ -44,9 +44,9 @@ fakeroot do_rootfs () { for type in ${IMAGE_FSTYPES}; do if test -z "$FAKEROOTKEY"; then - fakeroot -i ${TMPDIR}/fakedb.image oeimage -t $type -e ${FILE} + fakeroot -i ${TMPDIR}/fakedb.image bbimage -t $type -e ${FILE} else - oeimage -n "${IMAGE_NAME}" -t "$type" -e "${FILE}" + bbimage -n "${IMAGE_NAME}" -t "$type" -e "${FILE}" fi done -- cgit v1.2.3 From a702a4829935cbe81edef1de716bc81664f94e0a Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Thu, 24 Feb 2005 01:40:08 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/02/23 19:29:51-06:00 ti.com!kergoth Rename gnupg-devel to gnupg2, since this development branch has the binaries postfixed that way, so is clearly for the upcoming 2.x stable release. Also change libexecdir from /usr/libexec to /usr/libexec/gnupg2, as it was resulting in the gnupg binaries ending up in the root of /usr/libexec, rather than by packagename. 2005/02/23 19:24:52-06:00 ti.com!kergoth Fix the ipk rootfs/image classes to use ${libdir}/ipkg, now that ipkg does so as well. 2005/02/23 19:22:38-06:00 ti.com!kergoth Add a development version of gnupg (version 1.9.15) as gnupg-devel. Note that the 'gpgsm' and 'scdaemon' binaries are not currently being built, due to the additional dependencies they introduce. If you need them, let me know. One issue that needs to be fixed is that the gnupg-devel build needs to prefix or postfix its binaries, or conflict with 'gnupg', to ensure they don't step on one another's toes. 2005/02/23 19:18:34-06:00 ti.com!kergoth Add libgpg-error 1.0 (required by gnupg 0.9.15) and make the libgpg-error .bb's inherit binconfig. 2005/02/23 19:17:35-06:00 ti.com!kergoth Add libgcrypt 1.2.1 and make the libgcrypt .bb's inherit binconfig. 2005/02/23 19:16:20-06:00 ti.com!kergoth Add libassuan 0.6.9 (required by gnupg 0.9.15) and make the libassuan .bb's inherit binconfig. BKrev: 421d3078taXhU4QcW7mi0rDTzgYsgA --- classes/image_ipk.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/image_ipk.bbclass') diff --git a/classes/image_ipk.bbclass b/classes/image_ipk.bbclass index f2a1180e97..1681032e6f 100644 --- a/classes/image_ipk.bbclass +++ b/classes/image_ipk.bbclass @@ -36,7 +36,7 @@ fakeroot do_rootfs () { insert_feed_uris - rm ${IMAGE_ROOTFS}/usr/lib/ipkg/lists/oe + rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/lists/oe ${IMAGE_PREPROCESS_COMMAND} -- cgit v1.2.3 From 90ec62cb8bcfb6a301c0748f397440891721e018 Mon Sep 17 00:00:00 2001 From: Holger Schurig Date: Mon, 4 Apr 2005 10:18:42 +0000 Subject: classes/image_ipk.bbclass: make IMAGE_DEVICE_TABLE overridable BKrev: 425114824sn-52STk2-dgpGQOPBU2g --- classes/image_ipk.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/image_ipk.bbclass') diff --git a/classes/image_ipk.bbclass b/classes/image_ipk.bbclass index 1681032e6f..5fdd340673 100644 --- a/classes/image_ipk.bbclass +++ b/classes/image_ipk.bbclass @@ -18,7 +18,7 @@ def get_image_deps(d): DEPENDS += "${@get_image_deps(d)}" -IMAGE_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-minimal.txt')}" +IMAGE_DEVICE_TABLE ?= "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-minimal.txt')}" IMAGE_POSTPROCESS_COMMAND ?= "" # Must call real_do_rootfs() from inside here, rather than as a separate -- cgit v1.2.3