From 6ad5b8ff68141976206bf0e04492247dedfd6645 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 11 Dec 2007 10:00:09 +0000 Subject: rootfs_deb.bbclass: few fixes to get it working --- classes/rootfs_deb.bbclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/rootfs_deb.bbclass b/classes/rootfs_deb.bbclass index 935ef6e3f7..853ea225fc 100644 --- a/classes/rootfs_deb.bbclass +++ b/classes/rootfs_deb.bbclass @@ -10,8 +10,12 @@ fakeroot rootfs_deb_do_rootfs () { mkdir -p ${IMAGE_ROOTFS}/var/dpkg/info mkdir -p ${IMAGE_ROOTFS}/var/dpkg/updates + mkdir -p ${STAGING_ETCDIR_NATIVE}/apt/ + rm -f ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev rm -f ${STAGING_ETCDIR_NATIVE}/apt/preferences + > ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev + > ${STAGING_ETCDIR_NATIVE}/apt/preferences > ${IMAGE_ROOTFS}/var/dpkg/status > ${IMAGE_ROOTFS}/var/dpkg/available # > ${STAGING_DIR}/var/dpkg/status @@ -36,9 +40,9 @@ fakeroot rootfs_deb_do_rootfs () { priority=$(expr $priority + 5) done - tac ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev > ${STAGING_ETCDIR_NATIVE}/apt/sources.list + tac ${STAGING_ETCDIR_NATIVE}/apt/sources.list.rev > ${STAGING_DIR}/etc/apt/sources.list - cat "${STAGING_ETCDIR_NATIVE}/apt/apt.conf.sample" \ + cat "${STAGING_DIR}/etc/apt/apt.conf.sample" \ | sed -e 's#Architecture ".*";#Architecture "${TARGET_ARCH}";#' \ > "${STAGING_ETCDIR_NATIVE}/apt/apt-rootfs.conf" -- cgit v1.2.3 From eb9ccd66d4850d975ce31a71296647aac3489493 Mon Sep 17 00:00:00 2001 From: John Lee Date: Wed, 12 Dec 2007 06:41:18 +0000 Subject: fix typo to make sourcepkg.bbclass work when inherited. sourcepkg.bbclass:109:addtask dumpdata after archive_bb before do_create_diff_gz archive_bb should be "do_archive_bb". --- classes/sourcepkg.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass index 390d3684d4..bbc9f187ec 100644 --- a/classes/sourcepkg.bbclass +++ b/classes/sourcepkg.bbclass @@ -106,6 +106,6 @@ EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz addtask create_orig_tgz after do_unpack before do_patch addtask archive_bb after do_patch before do_dumpdata -addtask dumpdata after archive_bb before do_create_diff_gz +addtask dumpdata after do_archive_bb before do_create_diff_gz addtask create_diff_gz after do_dump_data before do_configure -- cgit v1.2.3 From 22d1bec6f7e0a58a30a083b1ca5b638b58fb78dc Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 13 Dec 2007 11:16:19 +0000 Subject: scons.bbclass: create ${D}${prefix} before calling scons --- classes/scons.bbclass | 1 + 1 file changed, 1 insertion(+) (limited to 'classes') diff --git a/classes/scons.bbclass b/classes/scons.bbclass index 534b3bd4c7..6d0a783dc2 100644 --- a/classes/scons.bbclass +++ b/classes/scons.bbclass @@ -6,6 +6,7 @@ scons_do_compile() { } scons_do_install() { + install -d ${D}${prefix} ${STAGING_BINDIR_NATIVE}/scons PREFIX=${D}${prefix} prefix=${D}${prefix} install || \ oefatal "scons install execution failed." } -- cgit v1.2.3 From 01b315d005188bca40f6713d485234ce97c65b7b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 14 Dec 2007 00:19:36 +0000 Subject: sip.bbclass: =+ emits problems with task dependencies, using += now --- classes/sip.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/sip.bbclass b/classes/sip.bbclass index 6f77f460dc..ae186bd04a 100644 --- a/classes/sip.bbclass +++ b/classes/sip.bbclass @@ -4,7 +4,7 @@ # yes, python-sip is actually a build-time dependency, since # the recipe installs sip.h -DEPENDS =+ "sip-native python-sip" +DEPENDS += "sip-native python-sip" # default stuff, do not uncomment # EXTRA_SIPTAGS = "-tWS_X11 -tQt_4_3_0" -- cgit v1.2.3 From b3f0aa20d4e63ee1af3f6ba7e3691b8e7de19ad8 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 15 Dec 2007 05:03:01 +0000 Subject: package.bbclass: Add ASSUME_SHLIBS, way to specify shlib dependencies for ASSUME_PROVIDED. * List of :[_] mappings. This info will be appended to one inferred by automatic shlib tracking code. So, it would be possible to have correct package dependencies even for libraries in ASSUME_PROVIDED. --- classes/package.bbclass | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'classes') diff --git a/classes/package.bbclass b/classes/package.bbclass index 67aeb33a13..37b9d83d97 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -694,6 +694,16 @@ python package_do_shlibs() { for l in lines: shlib_provider[l.rstrip()] = (dep_pkg, lib_ver) + assumed_libs = bb.data.getVar('ASSUME_SHLIBS', d, 1) + if assumed_libs: + for e in assumed_libs.split(): + l, dep_pkg = e.split(":") + lib_ver = None + dep_pkg = dep_pkg.rsplit("_", 1) + if len(dep_pkg) == 2: + lib_ver = dep_pkg[1] + dep_pkg = dep_pkg[0] + shlib_provider[l] = (dep_pkg, lib_ver) for pkg in packages.split(): bb.debug(2, "calculating shlib requirements for %s" % pkg) -- cgit v1.2.3 From c415ee0b42783845087f27f2c8c003ca34d65ca5 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 15 Dec 2007 05:25:44 +0000 Subject: sanity.bbclass: Requiring MACHINE to be set is too paranoid. * It's pretty legal to have only TARGET_ARCH set, for example to build non-machine-specific packages (for example, using external SDK). --- classes/sanity.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index 479abce7fa..cc413b7011 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -70,8 +70,9 @@ def check_sanity(e): if "diffstat-native" not in assume_provided: messages = messages + 'Please use ASSUME_PROVIDED +=, not ASSUME_PROVIDED = in your local.conf\n' - # Check that the MACHINE is valid - if not check_conf_exists("conf/machine/${MACHINE}.conf", e.data): + # Check that the MACHINE is valid, if it is set + if data.getVar('MACHINE', e.data, True): + if not check_conf_exists("conf/machine/${MACHINE}.conf", e.data): messages = messages + 'Please set a valid MACHINE in your local.conf\n' # Check that the DISTRO is valid -- cgit v1.2.3 From 7740963a5fa5ddcbcaf0900c3259de263cc561e9 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 15 Dec 2007 15:56:05 +0000 Subject: base.bbclass: Unexport TARGET_ARCH, quilt (at least) is a victim. --- classes/base.bbclass | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'classes') diff --git a/classes/base.bbclass b/classes/base.bbclass index 7526dff65e..2b508a8e84 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -848,6 +848,12 @@ def base_after_parse(d): bb.data.delVarFlag('MACHINE', 'export', d) bb.data.setVarFlag('MACHINE', 'unexport', 1, d) + # Make sure TARGET_ARCH isn't exported + # (breaks Makefiles using implicit rules, e.g. quilt, as GNU make has this + # in them, undocumented) + bb.data.delVarFlag('TARGET_ARCH', 'export', d) + bb.data.setVarFlag('TARGET_ARCH', 'unexport', 1, d) + # Make sure DISTRO isn't exported # (breaks sysvinit at least) bb.data.delVarFlag('DISTRO', 'export', d) -- cgit v1.2.3 From 1c3efeb25ec72bf688863618c0c004c80492c99a Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 16 Dec 2007 00:30:57 +0000 Subject: Ability to write ipk's depends on ipkg-utils-native having been staged. --- classes/package_ipk.bbclass | 1 + 1 file changed, 1 insertion(+) (limited to 'classes') diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 16d6050573..087bbcbfb4 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -323,4 +323,5 @@ python do_package_write_ipk () { bb.build.exec_func("do_package_ipk", d) } do_package_write_ipk[dirs] = "${D}" +do_package_write_ipk[depends] = "ipkg-utils-native:do_populate_staging" addtask package_write_ipk before do_package_write after do_package -- cgit v1.2.3 From 2fb453a9f4c045a6c74fccc81c1af8bf1e471ba7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 19 Dec 2007 11:19:31 +0000 Subject: package.bbclass: Don't strip files in .debug directories meaning rerunning the package task doesn't create chains of .debug directories (from poky) --- classes/package.bbclass | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'classes') diff --git a/classes/package.bbclass b/classes/package.bbclass index 37b9d83d97..ec8c3d97e2 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -149,6 +149,12 @@ def runstrip(file, d): bb.debug(1, "runstrip: skip %s" % file) return 0 + # If the file is in a .debug directory it was already stripped, + # don't do it again... + if os.path.dirname(file).endswith(".debug"): + bb.note("Already run strip") + return 0 + strip = bb.data.getVar("STRIP", d, 1) objcopy = bb.data.getVar("OBJCOPY", d, 1) -- cgit v1.2.3 From 44ef8aee5df1b3f6d4595c660f2f772e9e0d484c Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 22 Dec 2007 12:32:40 +0000 Subject: image.bbclass: Add FEED_DEPLOYDIR_BASE_URI to use deploy dir a feed ("bogofeed"). * If set to a base URL of ipk deploy dir as exported by HTTP/FTP, it will create set of feed configs to use deploy subdirs as feeds. --- classes/image.bbclass | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'classes') diff --git a/classes/image.bbclass b/classes/image.bbclass index 312307c831..ca9c9458e1 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -125,6 +125,17 @@ insert_feed_uris () { # insert new feed-sources echo "src/gz $feed_name $feed_uri" >> ${IMAGE_ROOTFS}/etc/ipkg/${feed_name}-feed.conf done + + # Allow to use package deploy directory contents as quick devel-testing + # feed. This creates individual feed configs for each arch subdir of those + # specified as compatible for the current machine. + # NOTE: Development-helper feature, NOT a full-fledged feed. + if [ -n "${FEED_DEPLOYDIR_BASE_URI}" ]; then + for arch in ${PACKAGE_ARCHS} + do + echo "src/gz local-$arch ${FEED_DEPLOYDIR_BASE_URI}/$arch" >> ${IMAGE_ROOTFS}/etc/ipkg/local-$arch-feed.conf + done + fi } log_check() { -- cgit v1.2.3