From 17c810af40dfbf084ef87c9b2a92874af43a6fe7 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Tue, 9 Feb 2010 11:33:09 +0000 Subject: sanity: correct misleading message about location of TMPDIR There is no point in telling users to move TMPDIR "back" to its current location :-} --- 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 f57d8e47d0..b66c9a9877 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -135,8 +135,9 @@ def check_sanity(e): checkfile = os.path.join(tmpdir, "saved_tmpdir") if os.path.exists(checkfile): f = file(checkfile, "r") - if (f.read().strip() != tmpdir): - messages = messages + "Error, TMPDIR has changed location. You need to either move it back to %s or rebuild\n" % tmpdir + oldpath = f.read().strip() + if (oldpath != tmpdir): + messages = messages + "Error, TMPDIR has changed location. You need to either move it back to %s or rebuild\n" % oldpath else: import bb bb.mkdirhier(tmpdir) -- cgit v1.2.3 From 8feccac9f3da5cb189450318cd1b82617ee5623a Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 10 Feb 2010 21:12:56 +0100 Subject: base.bbclass: handle xz compressed files and tarballs Signed-off-by: Bernhard Reutner-Fischer --- classes/base.bbclass | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'classes') diff --git a/classes/base.bbclass b/classes/base.bbclass index 9a242720e7..990e75ee14 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -794,6 +794,10 @@ def oe_unpack_file(file, data, url = None): cmd = 'gzip -dc %s > %s' % (file, efile) elif file.endswith('.bz2'): cmd = 'bzip2 -dc %s > %s' % (file, efile) + elif file.endswith('.tar.xz'): + cmd = 'xz -dc %s | tar x --no-same-owner -f -' % file + elif file.endswith('.xz'): + cmd = 'xz -dc %s > %s' % (file, efile) elif file.endswith('.zip') or file.endswith('.jar'): cmd = 'unzip -q -o' (type, host, path, user, pswd, parm) = bb.decodeurl(url) -- cgit v1.2.3 From fca5491289bbdfe41ec9d96357b2f0e61b289804 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 5 Feb 2010 13:28:57 +0100 Subject: vala.bbclass: dont put config.vapi to staging * config.vapi is per-app and can be considered as part of the autotools stuff Signed-off-by: Martin Jansa --- classes/vala.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/vala.bbclass b/classes/vala.bbclass index 125820c00c..26339058c8 100644 --- a/classes/vala.bbclass +++ b/classes/vala.bbclass @@ -5,10 +5,12 @@ FILES_${PN}-dev += "\ ${datadir}/vala/vapi/*.deps \ " +VALA_DONT_STAGE_VAPIS ?= "\(/config.vapi$\)\|\(/config.deps$\)" + # .vapi and .deps files are arch independent and need to be present in the # staging datadir for the native vala compiler do_stage_append() { install -d ${STAGING_DATADIR_NATIVE}/vala/vapi - find . -name "*.vapi" -exec install -m 0644 {} ${STAGING_DATADIR_NATIVE}/vala/vapi/ \; - find . -name "*.deps" -exec install -m 0644 {} ${STAGING_DATADIR_NATIVE}/vala/vapi/ \; + for VALAFILE in `find . -name "*.vapi" | grep -v "$VALA_DONT_STAGE_VAPIS"`; do install -m 0644 ${VALAFILE} ${STAGING_DATADIR_NATIVE}/vala/vapi/; done + for VALAFILE in `find . -name "*.deps" | grep -v "$VALA_DONT_STAGE_VAPIS"`; do install -m 0644 ${VALAFILE} ${STAGING_DATADIR_NATIVE}/vala/vapi/; done } -- cgit v1.2.3 From 92b4e2562f70af5db556390431477c73e68a7857 Mon Sep 17 00:00:00 2001 From: Denis 'Gnutoo' Carikli Date: Fri, 12 Feb 2010 13:51:26 +0100 Subject: autotools.bbclass: fix issue with native and sed STAGING_DIR_HOST is "" when using native bbclass: native.bbclass:STAGING_DIR_HOST = "" But in autotools.bbclass there is: sed -i -e s:${STAGING_DIR_HOST}::g $i which result in the following code in run.autotools_prepackage_lamangler sed -i -e s:::g $i which makes libxml2-native fail like this: | sed: -e expression #1, char 0: no previous regular expression I discussed it on IRC: Feb 11 17:41:29 GNUtoo: We should only be doing that is STAGING_DIR_HOST isn't empty I guess So I made a temporary fix which only workarround,because some issues persist: Feb 11 17:41:02 RP: heh, I wonder whether paths with colons in would be considered valid :-} Signed-off-by: Denis 'Gnutoo' Carikli --- classes/autotools.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 1ea4b6f1d0..c53583b8b6 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -152,7 +152,9 @@ autotools_prepackage_lamangler () { sed -i -e s:${CROSS_DIR}/${HOST_SYS}::g $i sed -i -e s:${CROSS_DIR}::g $i sed -i -e s:${STAGING_LIBDIR}:${libdir}:g $i - sed -i -e s:${STAGING_DIR_HOST}::g $i + if [ -n "${STAGING_DIR_HOST}" ]; then + sed -i -e s:${STAGING_DIR_HOST}::g $i + fi sed -i -e s:${STAGING_DIR}::g $i sed -i -e s:${S}::g $i sed -i -e s:${T}::g $i -- cgit v1.2.3 From 45f82a941c77e9d747814fa1e337ba803475d327 Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 14 Feb 2010 01:19:08 +0100 Subject: zaurus-kernels: move the kernel size check to linux-kexecboot.inc. * no need for DONT_CHECK_KERNELSIZE * clean up the affected files * check happens only if KERNEL_IMAGE_MAXSIZE is set --- classes/kernel.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 39ff928e6a..d4ecf72505 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -497,7 +497,7 @@ python populate_packages_prepend () { # Support checking the kernel size since some kernels need to reside in partitions # with a fixed length or there is a limit in transferring the kernel to memory do_sizecheck() { - if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" -a -z "${DONT_CHECK_KERNELSIZE}" ]; then + if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then size=`ls -l ${KERNEL_OUTPUT} | awk '{ print $5}'` if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then rm ${KERNEL_OUTPUT} -- cgit v1.2.3 From feb019622e464739efe440ecabc2f9e5b5477682 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 15 Feb 2010 11:16:40 +0100 Subject: e*bbclass: run autopoint in configure * remove config.rpath stuff from recipes --- classes/e.bbclass | 8 ++++++-- classes/efl.bbclass | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'classes') diff --git a/classes/e.bbclass b/classes/e.bbclass index fca9aa0010..5db0749eef 100644 --- a/classes/e.bbclass +++ b/classes/e.bbclass @@ -10,12 +10,16 @@ ARM_INSTRUCTION_SET = "arm" inherit autotools pkgconfig binconfig do_prepsources () { - make clean distclean || true + make clean distclean || true } addtask prepsources after do_patch before do_configure +do_configure_prepend() { + autopoint || touch config.rpath +} + do_configure_append() { - find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g + find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g } export CURL_CONFIG = "${STAGING_BINDIR_CROSS}/curl-config" diff --git a/classes/efl.bbclass b/classes/efl.bbclass index 805422fdf4..14334571ce 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -17,7 +17,7 @@ inherit autotools AUTOTOOLS_STAGE_PKGCONFIG = "1" do_configure_prepend() { - touch config.rpath + autopoint || touch config.rpath } do_install_prepend () { -- cgit v1.2.3 From 5fa112f9839d06f15680b8749a07f070d1789795 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 9 Feb 2010 19:28:04 +0100 Subject: kernel.bbclass: prepare for 2.6.33 header move and simplify logic a bit --- classes/kernel.bbclass | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'classes') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index d4ecf72505..3a52a067cc 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -127,16 +127,7 @@ kernel_do_stage() { mkdir -p ${STAGING_KERNEL_DIR}/include/asm-generic cp -fR include/asm-generic/* ${STAGING_KERNEL_DIR}/include/asm-generic/ - mkdir -p ${STAGING_KERNEL_DIR}/include/linux - cp -fR include/linux/* ${STAGING_KERNEL_DIR}/include/linux/ - - mkdir -p ${STAGING_KERNEL_DIR}/include/net - cp -fR include/net/* ${STAGING_KERNEL_DIR}/include/net/ - - mkdir -p ${STAGING_KERNEL_DIR}/include/pcmcia - cp -fR include/pcmcia/* ${STAGING_KERNEL_DIR}/include/pcmcia/ - - for entry in drivers/crypto drivers/media include/media include/acpi include/sound include/video include/scsi include/trace; do + for entry in drivers/crypto drivers/media include/generated include/linux include/net include/pcmcia include/media include/acpi include/sound include/video include/scsi include/trace; do if [ -d $entry ]; then mkdir -p ${STAGING_KERNEL_DIR}/$entry cp -fR $entry/* ${STAGING_KERNEL_DIR}/$entry/ -- cgit v1.2.3 From bd711cfab09394b6f3064eaed24b8761edc19f19 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 19 Feb 2010 11:34:44 -0700 Subject: package.bbclass: when running 'file', be explicit about the path to the magic This works around one relocation issue. Signed-off-by: Tom Rini Signed-off-by: Chris Larson --- classes/package.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/package.bbclass b/classes/package.bbclass index 062f782129..72c9053cc4 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -155,11 +155,12 @@ def runstrip(file, d): import commands, stat pathprefix = "export PATH=%s; " % bb.data.getVar('PATH', d, True) + magicfile = "%s/file/magic" % bb.data.getVar('STAGING_DATADIR_NATIVE', d, True) - ret, result = commands.getstatusoutput("%sfile '%s'" % (pathprefix, file)) + ret, result = commands.getstatusoutput("%sfile -m %s '%s'" % (pathprefix, magicfile, file)) if ret: - bb.error("runstrip: 'file %s' failed (forced strip)" % file) + bb.error("runstrip: 'file -m %s %s' failed (forced strip)" % (magicfile, file)) if "not stripped" not in result: bb.debug(1, "runstrip: skip %s" % file) -- cgit v1.2.3 From 40eae518118907dbbf8096a1eb646511ec27bc6f Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Fri, 19 Feb 2010 12:12:25 -0700 Subject: Revert "package.bbclass: when running 'file', be explicit about the path to the magic" Forgot to check a git status / log before pushing :) This reverts commit bd711cfab09394b6f3064eaed24b8761edc19f19. --- classes/package.bbclass | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'classes') diff --git a/classes/package.bbclass b/classes/package.bbclass index 72c9053cc4..062f782129 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -155,12 +155,11 @@ def runstrip(file, d): import commands, stat pathprefix = "export PATH=%s; " % bb.data.getVar('PATH', d, True) - magicfile = "%s/file/magic" % bb.data.getVar('STAGING_DATADIR_NATIVE', d, True) - ret, result = commands.getstatusoutput("%sfile -m %s '%s'" % (pathprefix, magicfile, file)) + ret, result = commands.getstatusoutput("%sfile '%s'" % (pathprefix, file)) if ret: - bb.error("runstrip: 'file -m %s %s' failed (forced strip)" % (magicfile, file)) + bb.error("runstrip: 'file %s' failed (forced strip)" % file) if "not stripped" not in result: bb.debug(1, "runstrip: skip %s" % file) -- cgit v1.2.3 From 54373795ff637421f9376def1e7e8d1a27324e30 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Mon, 22 Feb 2010 18:04:24 -0700 Subject: insane: check for .debug as a path component, not part of the path string Signed-off-by: Chris Larson --- classes/insane.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 804caf06ee..c2e8d9cf1d 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -279,7 +279,7 @@ def package_qa_check_dbg(path, name,d, elf): sane = True if not "-dbg" in name: - if '.debug' in path: + if '.debug' in path.split(os.path.sep): error_msg = "non debug package contains .debug directory: %s path %s" % \ (name, package_qa_clean_path(path,d)) sane = package_qa_handle_error(3, error_msg, name, path, d) -- cgit v1.2.3 From 046c7c5f1cdec5c92f6a365d8846ba33986277b6 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 24 Feb 2010 19:19:03 +0100 Subject: rootfs_ipk.bbclass: always specify tmp_dir in opkg-cl call with -t parameter * When option tmp_dir is used in opkg.conf installed on rootfs then it's used also in do_rootfs call and points to probably non-existent directory on buildhost like /var/lib/opkg/tmp. * The value of tmp_dir from rootfs is used even with another config file specified with -c parameter * Before this, it was using default value (/tmp) on buildhost, now it will use own "${IMAGE_ROOTFS}-tmp" and remove it after do_rootfs finish (usually already empty inside, cleaned by opkg itself) * Similar patch for testlab.bbclass will follow Signed-off-by: Martin Jansa --- classes/rootfs_ipk.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index 16dd511fcb..38d6121529 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -7,7 +7,8 @@ do_rootfs[depends] += "opkg-native:do_populate_staging" -IPKG_ARGS = "-f ${IPKGCONF_TARGET} -o ${IMAGE_ROOTFS} ${@base_conditional("PACKAGE_INSTALL_NO_DEPS", "1", "-nodeps", "", d)}" +IPKG_TMP_DIR = "${IMAGE_ROOTFS}-tmp" +IPKG_ARGS = "-f ${IPKGCONF_TARGET} -o ${IMAGE_ROOTFS} -t ${IPKG_TMP_DIR} ${@base_conditional("PACKAGE_INSTALL_NO_DEPS", "1", "-nodeps", "", d)}" PACKAGE_INSTALL_NO_DEPS ?= "0" @@ -31,6 +32,7 @@ fakeroot rootfs_ipk_do_rootfs () { package_generate_ipkg_conf mkdir -p ${T} + mkdir -p ${IPKG_TMP_DIR} mkdir -p ${IMAGE_ROOTFS}${libdir}/opkg/ STATUS=${IMAGE_ROOTFS}${libdir}/opkg/status @@ -100,6 +102,7 @@ fakeroot rootfs_ipk_do_rootfs () { ${ROOTFS_POSTPROCESS_COMMAND} log_check rootfs + rm -rf ${IPKG_TMP_DIR} } rootfs_ipk_log_check() { -- cgit v1.2.3 From 13555b5d9620b78e6e4d8f88de551f79a90e76c6 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 24 Feb 2010 09:22:47 +0000 Subject: testlab.bbclass: use opkg.conf from staging, always specify tmp_dir in opkg-cl call with -t parameter * Use opkg.conf from staging in the same way as do_rootfs does * When option tmp_dir is used in opkg.conf installed on rootfs then it's used also in do_rootfs call and points to probably non-existent directory on buildhost like /var/lib/opkg/tmp. * The value of tmp_dir from rootfs is used even with another config file specified with -c parameter * Before this, it was using default value (/tmp) on buildhost, now it will use own "${IMAGE_ROOTFS}-tmp" and remove it after do_rootfs finish (usually already empty inside, cleaned by opkg itself) Signed-off-by: Martin Jansa Acked-by: Denys Dmytriyenko Acked-by: Koen Kooi --- classes/testlab.bbclass | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'classes') diff --git a/classes/testlab.bbclass b/classes/testlab.bbclass index fc923c5112..e6c9c8e284 100644 --- a/classes/testlab.bbclass +++ b/classes/testlab.bbclass @@ -24,26 +24,31 @@ do_testlab() { if [ -e ${IMAGE_ROOTFS}/etc/opkg ] && [ "${ONLINE_PACKAGE_MANAGEMENT}" = "full" ] ; then + IPKG_TMP_DIR="${IMAGE_ROOTFS}-tmp" + IPKG_ARGS="-f ${STAGING_ETCDIR_NATIVE}/opkg.conf -o ${IMAGE_ROOTFS} -t ${IPKG_TMP_DIR}" + TESTLAB_DIR="${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-testlab" mkdir -p ${TESTLAB_DIR}/ + mkdir -p ${IPKG_TMP_DIR}/ ls -laR ${IMAGE_ROOTFS} > ${TESTLAB_DIR}/files-in-image.txt echo > ${TESTLAB_DIR}/installed-packages.txt echo -e "digraph depends {\n node [shape=plaintext]" > ${TESTLAB_DIR}/depends.dot - for pkg in $(opkg-cl -f ${IMAGE_ROOTFS}/etc/opkg -o ${IMAGE_ROOTFS} list_installed | awk '{print $1}') ; do - opkg-cl -f ${IMAGE_ROOTFS}/etc/opkg -o ${IMAGE_ROOTFS} info $pkg | awk '/Package/ {printf $2"_"} /Version/ {printf $2"_"} /Archi/ {print $2".ipk"}' >> ${TESTLAB_DIR}/installed-packages.txt + for pkg in $(opkg-cl ${IPKG_ARGS} list_installed | awk '{print $1}') ; do + opkg-cl ${IPKG_ARGS} info $pkg | awk '/Package/ {printf $2"_"} /Version/ {printf $2"_"} /Archi/ {print $2".ipk"}' >> ${TESTLAB_DIR}/installed-packages.txt - for depends in $(opkg-cl -f ${IMAGE_ROOTFS}/etc/opkg -o ${IMAGE_ROOTFS} info $pkg | grep Depends) ; do + for depends in $(opkg-cl ${IPKG_ARGS} info $pkg | grep Depends) ; do echo "$pkg OPP $depends;" | grep -v "(" | grep -v ")" | grep -v Depends | sed -e 's:,::g' -e 's:-:_:g' -e 's:\.:_:g' -e 's:+::g' |sed 's:OPP:->:g' >> ${TESTLAB_DIR}/depends.dot done - for recommends in $(opkg-cl -f ${IMAGE_ROOTFS}/etc/opkg -o ${IMAGE_ROOTFS} info $pkg | grep Recom) ; do + for recommends in $(opkg-cl ${IPKG_ARGS} info $pkg | grep Recom) ; do echo "$pkg OPP $recommends [style=dotted];" | grep -v "(" | grep -v ")" | grep -v Recom | sed -e 's:,::g' -e 's:-:_:g' -e 's:\.:_:g' -e 's:+::g' |sed 's:OPP:->:g' >> ${TESTLAB_DIR}/depends.dot done done echo "}" >> ${TESTLAB_DIR}/depends.dot + rm -rf ${IPKG_TMP_DIR} grep -v kernel_2 ${TESTLAB_DIR}/depends.dot | grep -v kernel_image > ${TESTLAB_DIR}/depends-nokernel.dot grep -v libc6 ${TESTLAB_DIR}/depends-nokernel.dot | grep -v libgcc > ${TESTLAB_DIR}/depends-nokernel-nolibc.dot -- cgit v1.2.3 From df32920678d15c86897b50b752b937210a01edea Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 15 Jan 2010 08:30:33 +0000 Subject: base.bbclass: use bb.utils.*_sum instead of calling md5/sha sum commands Patch courtesy the Poky project. Signed-off-by: Chris Larson Acked-by: Marcin Juszkiewicz Acked-by: Tom Rini --- classes/base.bbclass | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'classes') diff --git a/classes/base.bbclass b/classes/base.bbclass index 990e75ee14..72e57300d8 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -76,23 +76,26 @@ def base_chk_file_vars(parser, localpath, params, data): raise Exception("The path does not exist '%s'" % localpath) if want_md5sum: - try: - md5pipe = os.popen('PATH=%s md5sum %s' % (bb.data.getVar('PATH', data, True), localpath)) - md5data = (md5pipe.readline().split() or [ "" ])[0] - md5pipe.close() - except OSError, e: - raise Exception("Executing md5sum failed") + md5data = bb.utils.md5_file(localpath) + if want_md5sum != md5data: bb.note("The MD5Sums did not match. Wanted: '%s' and Got: '%s'" % (want_md5sum, md5data)) raise Exception("MD5 Sums do not match. Wanted: '%s' Got: '%s'" % (want_md5sum, md5data)) if want_sha256sum: - try: - shapipe = os.popen('PATH=%s oe_sha256sum %s' % (bb.data.getVar('PATH', data, True), localpath)) - sha256data = (shapipe.readline().split() or [ "" ])[0] - shapipe.close() - except OSError, e: - raise Exception("Executing shasum failed") + shadata = bb.utils.sha256_file(localpath) + + # sha256_file() can return None if we are running on Python 2.4 (hashlib is + # 2.5 onwards, sha in 2.4 is 160-bit only), so check for this and call the + # standalone shasum binary if required. + if shadata is None: + try: + shapipe = os.popen('PATH=%s oe_sha256sum %s' % (bb.data.getVar('PATH', data, True), localpath)) + shadata = (shapipe.readline().split() or [ "" ])[0] + shapipe.close() + except OSError: + raise Exception("Executing shasum failed, please build shasum-native") + if want_sha256sum != sha256data: bb.note("The SHA256Sums did not match. Wanted: '%s' and Got: '%s'" % (want_sha256sum, sha256data)) raise Exception("SHA256 Sums do not match. Wanted: '%s' Got: '%s'" % (want_sha256sum, sha256data)) -- cgit v1.2.3 From 96da6f4431503ab682ae690868fb5fcaa3a8947f Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Wed, 19 Aug 2009 17:24:32 +0000 Subject: cross.bbclass: keep TARGET_SYS & TARGET_PREFIX independent. Signed-off-by: Chris Larson Acked-by: Michael Smith Acked-by: Tom Rini --- classes/cross.bbclass | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'classes') diff --git a/classes/cross.bbclass b/classes/cross.bbclass index 1de157c0f5..9a3d39cb49 100644 --- a/classes/cross.bbclass +++ b/classes/cross.bbclass @@ -2,6 +2,11 @@ # no need for them to be a direct target of 'world' EXCLUDE_FROM_WORLD = "1" +# In order to keep TARGET_PREFIX decoupled from TARGET_SYS, let's force the +# binary names to match the former, rather than relying on autoconf's implicit +# prefixing based on the latter. +EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}" + # Save PACKAGE_ARCH before changing HOST_ARCH OLD_PACKAGE_ARCH := "${PACKAGE_ARCH}" PACKAGE_ARCH = "${OLD_PACKAGE_ARCH}" -- cgit v1.2.3 From 22ee98e2fc4d58de61184332e41b9a44c949ed17 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 25 Feb 2010 13:11:28 -0700 Subject: Revert "base.bbclass: use bb.utils.*_sum instead of calling md5/sha sum commands" Back this out for the time being, things are exploding now. This reverts commit df32920678d15c86897b50b752b937210a01edea. --- classes/base.bbclass | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) (limited to 'classes') diff --git a/classes/base.bbclass b/classes/base.bbclass index 72e57300d8..990e75ee14 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -76,26 +76,23 @@ def base_chk_file_vars(parser, localpath, params, data): raise Exception("The path does not exist '%s'" % localpath) if want_md5sum: - md5data = bb.utils.md5_file(localpath) - + try: + md5pipe = os.popen('PATH=%s md5sum %s' % (bb.data.getVar('PATH', data, True), localpath)) + md5data = (md5pipe.readline().split() or [ "" ])[0] + md5pipe.close() + except OSError, e: + raise Exception("Executing md5sum failed") if want_md5sum != md5data: bb.note("The MD5Sums did not match. Wanted: '%s' and Got: '%s'" % (want_md5sum, md5data)) raise Exception("MD5 Sums do not match. Wanted: '%s' Got: '%s'" % (want_md5sum, md5data)) if want_sha256sum: - shadata = bb.utils.sha256_file(localpath) - - # sha256_file() can return None if we are running on Python 2.4 (hashlib is - # 2.5 onwards, sha in 2.4 is 160-bit only), so check for this and call the - # standalone shasum binary if required. - if shadata is None: - try: - shapipe = os.popen('PATH=%s oe_sha256sum %s' % (bb.data.getVar('PATH', data, True), localpath)) - shadata = (shapipe.readline().split() or [ "" ])[0] - shapipe.close() - except OSError: - raise Exception("Executing shasum failed, please build shasum-native") - + try: + shapipe = os.popen('PATH=%s oe_sha256sum %s' % (bb.data.getVar('PATH', data, True), localpath)) + sha256data = (shapipe.readline().split() or [ "" ])[0] + shapipe.close() + except OSError, e: + raise Exception("Executing shasum failed") if want_sha256sum != sha256data: bb.note("The SHA256Sums did not match. Wanted: '%s' and Got: '%s'" % (want_sha256sum, sha256data)) raise Exception("SHA256 Sums do not match. Wanted: '%s' Got: '%s'" % (want_sha256sum, sha256data)) -- cgit v1.2.3 From 6338989af8aed24ab9228c78e2f68a4e8290075c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 25 Feb 2010 20:27:09 +0000 Subject: nativesdk.bbclass: Fix various DEPENDS handling bugs and add to OVERRIDES (from poky) Signed-off-by: Richard Purdie --- classes/nativesdk.bbclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/nativesdk.bbclass b/classes/nativesdk.bbclass index 080adc5d77..75f5790121 100644 --- a/classes/nativesdk.bbclass +++ b/classes/nativesdk.bbclass @@ -51,9 +51,12 @@ FILES_${PN}-dbg += "${prefix}/.debug \ export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${libdir}/pkgconfig" export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}" +ORIG_DEPENDS := "${DEPENDS}" +DEPENDS_virtclass-nativesdk ?= "${ORIG_DEPENDS}" + python __anonymous () { pn = bb.data.getVar("PN", d, True) - depends = bb.data.getVar("DEPENDS", d, True) + depends = bb.data.getVar("DEPENDS_virtclass-nativesdk", d, True) deps = bb.utils.explode_deps(depends) newdeps = [] for dep in deps: @@ -65,7 +68,7 @@ python __anonymous () { newdeps.append(dep + "-nativesdk") else: newdeps.append(dep) - bb.data.setVar("DEPENDS", " ".join(newdeps), d) + bb.data.setVar("DEPENDS_virtclass-nativesdk", " ".join(newdeps), d) provides = bb.data.getVar("PROVIDES", d, True) for prov in provides.split(): if prov.find(pn) != -1: @@ -73,6 +76,7 @@ python __anonymous () { if not prov.endswith("-nativesdk"): provides = provides.replace(prov, prov + "-nativesdk") bb.data.setVar("PROVIDES", provides, d) + bb.data.setVar("OVERRIDES", bb.data.getVar("OVERRIDES", d, False) + ":virtclass-nativesdk", d) } -- cgit v1.2.3 From 1b5e7041ae3b26b7e59c76bd2f2fd72e35492940 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 19 Feb 2010 08:47:48 +0000 Subject: package.bbclass: when running 'file', be explicit about the path to the magic This works around one relocation issue. Signed-off-by: Tom Rini Signed-off-by: Chris Larson --- classes/package.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/package.bbclass b/classes/package.bbclass index 062f782129..72c9053cc4 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -155,11 +155,12 @@ def runstrip(file, d): import commands, stat pathprefix = "export PATH=%s; " % bb.data.getVar('PATH', d, True) + magicfile = "%s/file/magic" % bb.data.getVar('STAGING_DATADIR_NATIVE', d, True) - ret, result = commands.getstatusoutput("%sfile '%s'" % (pathprefix, file)) + ret, result = commands.getstatusoutput("%sfile -m %s '%s'" % (pathprefix, magicfile, file)) if ret: - bb.error("runstrip: 'file %s' failed (forced strip)" % file) + bb.error("runstrip: 'file -m %s %s' failed (forced strip)" % (magicfile, file)) if "not stripped" not in result: bb.debug(1, "runstrip: skip %s" % file) -- cgit v1.2.3 From 9ce55ea62be97061e4b02c189f77a4ca506f3a7d Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Mon, 1 Mar 2010 11:15:56 -0700 Subject: Revert "package.bbclass: when running 'file', be explicit about the path to the magic" Drop this for now, as apparently the magic file location varies with 'file' version. I'll just patch file to find it relative to the binary location instead. This reverts commit 1b5e7041ae3b26b7e59c76bd2f2fd72e35492940. --- classes/package.bbclass | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'classes') diff --git a/classes/package.bbclass b/classes/package.bbclass index 72c9053cc4..062f782129 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -155,12 +155,11 @@ def runstrip(file, d): import commands, stat pathprefix = "export PATH=%s; " % bb.data.getVar('PATH', d, True) - magicfile = "%s/file/magic" % bb.data.getVar('STAGING_DATADIR_NATIVE', d, True) - ret, result = commands.getstatusoutput("%sfile -m %s '%s'" % (pathprefix, magicfile, file)) + ret, result = commands.getstatusoutput("%sfile '%s'" % (pathprefix, file)) if ret: - bb.error("runstrip: 'file -m %s %s' failed (forced strip)" % (magicfile, file)) + bb.error("runstrip: 'file %s' failed (forced strip)" % file) if "not stripped" not in result: bb.debug(1, "runstrip: skip %s" % file) -- cgit v1.2.3 From f2f02f6e4754f69b83de7613860fd580e27c0237 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 2 Mar 2010 13:27:22 +0100 Subject: base.bbclass: create tmp/legacy-staging.log file with names of recipes which need work Signed-off-by: Marcin Juszkiewicz --- classes/base.bbclass | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'classes') diff --git a/classes/base.bbclass b/classes/base.bbclass index 990e75ee14..358a9a2b68 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -1155,6 +1155,14 @@ python do_populate_staging () { if legacy: bb.data.setVar("SYSROOT_DESTDIR", "", d) bb.note("Legacy staging mode for %s" % bb.data.getVar("FILE", d, True)) + + try: + file = open("%s/legacy-staging.log" % bb.data.getVar("TMPDIR", d, 1), "a") + file.write("%s\n" % bb.data.getVar("FILE", d, True)) + file.close() + except: + pass + if bb.data.getVarFlags('do_stage', d) is None: bb.fatal("This recipe (%s) has a do_stage_prepend or do_stage_append and do_stage now doesn't exist. Please rename this to do_stage()" % bb.data.getVar("FILE", d, True)) lock = bb.utils.lockfile(lockfile) -- cgit v1.2.3 From 31e93854259130e20a4e08c9d803c34edc4b447e Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 1 Mar 2010 11:18:28 +0000 Subject: qemu: Perform our sanity checks based on ENABLE_BINARY_LOCALE_GENERATION Perform qemu-related checks not based on if we're ARM but based on if we'll be using qemu for binary locale generation. Clarify what the first of these sanity checks does. Next, change the check for a provided qemu binary to be generic enough to work on all arches (and catch distribution or user built versions of qemu). While we're in here, correct the gcc version check code in base.bbclass. Signed-off-by: Tom Rini Acked-by: Denys Dmytriyenko Acked-by: Chris Larson --- classes/base.bbclass | 9 ++++----- classes/sanity.bbclass | 9 +++++---- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'classes') diff --git a/classes/base.bbclass b/classes/base.bbclass index 358a9a2b68..65ad478cbc 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -1341,16 +1341,15 @@ def check_app_exists(app, d): return len(which(path, app)) != 0 def check_gcc3(data): - # Primarly used by qemu to make sure we have a workable gcc-3.4.x. - # Start by checking for the program name as we build it, was not - # all host-provided gcc-3.4's will work. - + # Primarly used by qemu to make sure we have a workable gcc-3.x. + # Start by checking for the program name as we build it as there + # are some distribtuion provided gcc-3.x's that will not work. gcc3_versions = 'gcc-3.4.6 gcc-3.4.4 gcc34 gcc-3.4 gcc-3.4.7 gcc-3.3 gcc33 gcc-3.3.6 gcc-3.2 gcc32' for gcc3 in gcc3_versions.split(): if check_app_exists(gcc3, data): return gcc3 - + return False # Patch handling diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index b66c9a9877..a78e8edf8a 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -83,8 +83,10 @@ def check_sanity(e): required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn bzip2 tar gzip gawk md5sum" - if data.getVar('TARGET_ARCH', e.data, True) == "arm": - # qemu-native needs gcc 3.x + # If we'll be running qemu, perform some sanity checks + if data.getVar('ENABLE_BINARY_LOCALE_GENERATION', e.data, True): + # Some versions of qemu-native needs gcc 3.x. Do a special + # check here to allow for host 'gcc' is 3.x. if "qemu-native" not in assume_provided and "gcc3-native" in assume_provided: gcc_version = commands.getoutput("${BUILD_PREFIX}gcc --version | head -n 1 | cut -f 3 -d ' '") @@ -93,8 +95,7 @@ def check_sanity(e): missing = missing + "gcc-3.x (needed for qemu-native)," if "qemu-native" in assume_provided: - if not check_app_exists("qemu-arm", e.data): - messages = messages + "qemu-native was in ASSUME_PROVIDED but the QEMU binaries (qemu-arm) can't be found in PATH" + required_utilities += "qemu" try: if os.path.exists("/proc/sys/vm/mmap_min_addr"): -- cgit v1.2.3 From 2d132de5abecf53a9e340dc376bc8af4cfb07464 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 1 Mar 2010 16:34:37 +0000 Subject: Add glibc-pic package glibc-package.bbclass: Add glibc-pic package By default, in our glibc builds we don't have these libraries. They may however come from various binary toolchains, or custom source builds. Signed-off-by: Tom Rini Acked-by: Khem Raj --- classes/glibc-package.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/glibc-package.bbclass b/classes/glibc-package.bbclass index 413ed14931..af75bb53de 100644 --- a/classes/glibc-package.bbclass +++ b/classes/glibc-package.bbclass @@ -9,7 +9,7 @@ GLIBC_INTERNAL_USE_BINARY_LOCALE ?= "ondevice" -PACKAGES = "glibc-dbg glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-static glibc-doc glibc-locale libcidn libmemusage libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" +PACKAGES = "glibc-dbg glibc catchsegv sln nscd ldd localedef glibc-utils glibc-pic glibc-dev glibc-static glibc-doc glibc-locale libcidn libmemusage libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* locale-base-* glibc-binary-localedata-*" INSANE_SKIP_glibc-dbg = True @@ -23,6 +23,7 @@ glibcfiles = "${libc_baselibs} ${libexecdir}/* ${datadir}/zoneinfo ${@base_condi glibcdbgfiles = "${bindir}/.debug ${sbindir}/.debug ${libdir}/.debug \ ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug \ ${libdir}/gconv/.debug ${libexecdir}/*/.debug" +glibcpicfiles = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/" glibcdevfiles = "${bindir}/rpcgen ${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \ ${libdir}/*.a ${libdir}/*.o ${libdir}/pkgconfig ${libdir}/*nonshared.a \ ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal" @@ -35,6 +36,8 @@ FILES_libcidn = "${base_libdir}/libcidn*.so" FILES_libmemusage = "${base_libdir}/libmemusage.so" FILES_glibc-extra-nss = "${base_libdir}/libnss*" FILES_sln = "${base_sbindir}/sln" +FILES_glibc-pic = "${glibcpicfiles}" +FILES_${PN}-pic = "${glibcpicfiles}" FILES_glibc-dev = "${glibcdevfiles}" FILES_${PN}-dev = "${glibcdevfiles}" FILES_glibc-dbg = "${glibcdbgfiles}" -- cgit v1.2.3 From 679a2367acde02f76f43f446c56c1eefed4e69c0 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 3 Mar 2010 12:05:33 -0700 Subject: firefox: Perform a number of cleanups and fix consistency issues. - parallel builds need to happen via MOZ_MAKE_FLAGS and it gripes if still passed -jN, so keep the old value before we clear it. - Move the HOST_LIBIDL stuff into configure, otherwise bad things happen when you don't have pkg-config on the build host. - Prior to 3.6, wireless-tools can be, or not be built already and the Necko wifi options deals. With how 3.6 is configured, it must be disabled or DEPENDED on. For consistency, turn it off. - In 3.5 and newer, libnotify can be used, add it to DEPENDS (could be disabled). - Because of both of the above, bump PR. Signed-off-by: Tom Rini Acked-by: Khem Raj --- classes/mozilla.bbclass | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'classes') diff --git a/classes/mozilla.bbclass b/classes/mozilla.bbclass index c9a3966709..4e3054b9ab 100644 --- a/classes/mozilla.bbclass +++ b/classes/mozilla.bbclass @@ -6,10 +6,12 @@ SRC_URI += "file://mozconfig" inherit gettext pkgconfig +# Parallel make is special in mozilla. +OLD_PARALLEL_MAKE := "${PARALLEL_MAKE}" +PARALLEL_MAKE = "" + EXTRA_OECONF = "--target=${TARGET_SYS} --host=${BUILD_SYS} \ --build=${BUILD_SYS} --prefix=${prefix}" -EXTRA_OEMAKE = "'HOST_LIBIDL_LIBS=${HOST_LIBIDL_LIBS}' \ - 'HOST_LIBIDL_CFLAGS=${HOST_LIBIDL_CFLAGS}'" SELECTED_OPTIMIZATION = "-Os -fsigned-char -fno-strict-aliasing" export CROSS_COMPILE = "1" @@ -17,9 +19,6 @@ export MOZCONFIG = "${WORKDIR}/mozconfig" export MOZ_OBJDIR = "${S}" export CONFIGURE_ARGS = "${EXTRA_OECONF}" -export HOST_LIBIDL_CFLAGS = "`${HOST_LIBIDL_CONFIG} --cflags`" -export HOST_LIBIDL_LIBS = "`${HOST_LIBIDL_CONFIG} --libs`" -export HOST_LIBIDL_CONFIG = "PKG_CONFIG_PATH=${STAGING_LIBDIR_NATIVE}/pkgconfig pkg-config libIDL-2.0" export HOST_CC = "${BUILD_CC}" export HOST_CXX = "${BUILD_CXX}" export HOST_CFLAGS = "${BUILD_CFLAGS}" @@ -38,7 +37,22 @@ mozilla_do_configure() { `dirname $cg`/ done ) - if [ -e ${MOZ_OBJDIR}/Makefile ] ; then + + # Put PARALLEL_MAKE into mozconfig + if [ ! -z "${OLD_PARALLEL_MAKE}" ] ; then + echo mk_add_options MOZ_MAKE_FLAGS=\"${OLD_PARALLEL_MAKE}\" \ + >> ${MOZCONFIG} + fi + + # Set the host libIDL stuff correctly. + export HOST_LIBIDL_CONFIG="PKG_CONFIG_PATH=${STAGING_LIBDIR_NATIVE}/pkgconfig pkg-config libIDL-2.0" + # Due to sysroot we need to sed out references to the target staging + # when building the native version of xpidl Symptons of the failure + # include "gthread.h:344: error: size of array 'type name' is negative" + export HOST_LIBIDL_CFLAGS="`${HOST_LIBIDL_CONFIG} --cflags | sed -e s:${STAGING_DIR_TARGET}:${STAGING_DIR_NATIVE}:g`" + export HOST_LIBIDL_LIBS="`${HOST_LIBIDL_CONFIG} --libs`" + + if [ -e ${MOZ_OBJDIR}/Makefile ] ; then oe_runmake -f client.mk ${MOZ_OBJDIR}/Makefile \ ${MOZ_OBJDIR}/config.status fi -- cgit v1.2.3 From 27de16184dccb7b3a49bd08c9282fe4843d00251 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 3 Mar 2010 14:04:57 -0700 Subject: qemu: Move gcc version check, qemu-TARGET logic into qemu.bbclass Move the logic to determine what qemu-TARGET to run into qemu.bbclass so we can check for the right binary in sanity.bbclass. This code was duplicated by glibc-package and eglibc-package anyhow and with the new fn we can clean up the usage in these classes a bit. Now that we have a class for qemu stuff, and the gcc check is just for qemu, move it there. --- classes/base.bbclass | 12 ------------ classes/glibc-package.bbclass | 15 +++++---------- classes/qemu.bbclass | 27 +++++++++++++++++++++++++++ classes/sanity.bbclass | 4 +++- 4 files changed, 35 insertions(+), 23 deletions(-) create mode 100644 classes/qemu.bbclass (limited to 'classes') diff --git a/classes/base.bbclass b/classes/base.bbclass index 65ad478cbc..c083d48d85 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -1340,18 +1340,6 @@ def check_app_exists(app, d): path = data.getVar('PATH', d, 1) return len(which(path, app)) != 0 -def check_gcc3(data): - # Primarly used by qemu to make sure we have a workable gcc-3.x. - # Start by checking for the program name as we build it as there - # are some distribtuion provided gcc-3.x's that will not work. - gcc3_versions = 'gcc-3.4.6 gcc-3.4.4 gcc34 gcc-3.4 gcc-3.4.7 gcc-3.3 gcc33 gcc-3.3.6 gcc-3.2 gcc32' - - for gcc3 in gcc3_versions.split(): - if check_app_exists(gcc3, data): - return gcc3 - - return False - # Patch handling inherit patch diff --git a/classes/glibc-package.bbclass b/classes/glibc-package.bbclass index af75bb53de..d47c914b36 100644 --- a/classes/glibc-package.bbclass +++ b/classes/glibc-package.bbclass @@ -7,6 +7,8 @@ # "precompiled" - The binary locale files are pregenerated and already present # "ondevice" - The device will build the locale files upon first boot through the postinst +inherit qemu + GLIBC_INTERNAL_USE_BINARY_LOCALE ?= "ondevice" PACKAGES = "glibc-dbg glibc catchsegv sln nscd ldd localedef glibc-utils glibc-pic glibc-dev glibc-static glibc-doc glibc-locale libcidn libmemusage libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" @@ -215,12 +217,6 @@ python package_do_split_gconvs () { bb.data.setVar('RDEPENDS_%s' % pkgname, legitimize_package_name('glibc-binary-localedata-%s' % glibc_name), d) def output_locale_binary(name, pkgname, locale, encoding): - target_arch = bb.data.getVar("TARGET_ARCH", d, 1) - if target_arch in ("i486", "i586", "i686"): - target_arch = "i386" - elif target_arch == "powerpc": - target_arch = "ppc" - # This is a hack till linux-libc-headers gets patched for the missing arm syscalls and all arm device kernels as well if bb.data.getVar("DISTRO_NAME", d, 1) == "Angstrom": kernel_ver = "2.6.24" @@ -229,10 +225,9 @@ python package_do_split_gconvs () { else: kernel_ver = bb.data.getVar("OLDEST_KERNEL", d, 1) - if kernel_ver is None: - qemu = "qemu-%s -s 1048576" % target_arch - else: - qemu = "qemu-%s -s 1048576 -r %s" % (target_arch, kernel_ver) + qemu = qemu_target_binary(d) + " -s 1048576" + if kernel_ver: + qemu += " -r %s" % (kernel_ver) pkgname = 'locale-base-' + legitimize_package_name(name) treedir = base_path_join(bb.data.getVar("WORKDIR", d, 1), "locale-tree") diff --git a/classes/qemu.bbclass b/classes/qemu.bbclass new file mode 100644 index 0000000000..40a3542450 --- /dev/null +++ b/classes/qemu.bbclass @@ -0,0 +1,27 @@ +# +# This class contains functions for recipes that need QEMU or test for its +# existance. +# + +def check_gcc3(data): + # Used by qemu to make sure we have a workable gcc-3.x. + # Start by checking for the program name as we build it as there + # are some distribtuion provided gcc-3.x's that will not work. + gcc3_versions = 'gcc-3.4.6 gcc-3.4.4 gcc34 gcc-3.4 gcc-3.4.7 gcc-3.3 gcc33 gcc-3.3.6 gcc-3.2 gcc32' + + for gcc3 in gcc3_versions.split(): + if check_app_exists(gcc3, data): + return gcc3 + + return False + +def qemu_target_binary(data): + import bb + + target_arch = bb.data.getVar("TARGET_ARCH", data, 1) + if target_arch in ("i486", "i586", "i686"): + target_arch = "i386" + elif target_arch == "powerpc": + target_arch = "ppc" + + return "qemu-" + target_arch diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index a78e8edf8a..5f0e724456 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -2,6 +2,8 @@ # Sanity check the users setup for common misconfigurations # +inherit qemu + def raise_sanity_error(msg): import bb bb.fatal(""" Openembedded's config sanity checker detected a potential misconfiguration. @@ -95,7 +97,7 @@ def check_sanity(e): missing = missing + "gcc-3.x (needed for qemu-native)," if "qemu-native" in assume_provided: - required_utilities += "qemu" + required_utilities += " %s" % (qemu_target_binary(e.data)) try: if os.path.exists("/proc/sys/vm/mmap_min_addr"): -- cgit v1.2.3 From 7e0dca393772c8145fb8dccd1a5898bc4fb7933a Mon Sep 17 00:00:00 2001 From: Chris Conroy Date: Wed, 16 Sep 2009 07:11:14 +0000 Subject: rootfs_ipk.bbclass: move rootfs postprocess command I ran into a problem yesterday where the ROOTFS_POSTPROCESS_COMMAND started failing after I turned off ONLINE_PACKAGE_MANAGEMENT. It seems the problem is that if package management is turned off, then the opkg directory gets deleted. Subsequent opkg commands in the ROOTFS_POSTPROCESS_COMMAND fail to open the lock file because the directory is gone. This patch simply moves the postprocess command above the destruction of the opkg directory to allow any such commands to complete successfully. Acked-by: Marcin Juszkiewicz --- classes/rootfs_ipk.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index 38d6121529..3a73ed8854 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -82,6 +82,8 @@ fakeroot rootfs_ipk_do_rootfs () { install -d ${IMAGE_ROOTFS}/${sysconfdir} echo ${BUILDNAME} > ${IMAGE_ROOTFS}/${sysconfdir}/version + + ${ROOTFS_POSTPROCESS_COMMAND} if [ "${ONLINE_PACKAGE_MANAGEMENT}" != "none" ]; then if [ "${ONLINE_PACKAGE_MANAGEMENT}" == "add" ]; then @@ -99,8 +101,6 @@ fakeroot rootfs_ipk_do_rootfs () { rm -rf ${IMAGE_ROOTFS}/usr/lib/opkg fi - ${ROOTFS_POSTPROCESS_COMMAND} - log_check rootfs rm -rf ${IPKG_TMP_DIR} } -- cgit v1.2.3 From 82c4e6b36216f2b1c31116a5c784f5e256a1a241 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Mon, 9 Nov 2009 12:11:36 +0000 Subject: kernel.bbclass: pass ${KERNEL_VERSION} to depmod -a The postinsts for kernel-image and modules run "depmod -a" on the target, but this only updates the old kernel's modules.dep. "depmod -a ${KERNEL_VERSION}" updates the files in /lib/modules/${KERNEL_VERSION}. Signed-off-by: Michael Smith Acked-by: Marcin Juszkiewicz --- classes/kernel.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 3a52a067cc..69ab422c43 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -267,7 +267,7 @@ fi if [ -n "$D" ]; then ${HOST_PREFIX}depmod-${KERNEL_MAJOR_VERSION} -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION} else - depmod -a + depmod -a ${KERNEL_VERSION} fi } @@ -275,7 +275,7 @@ pkg_postinst_modules () { if [ -n "$D" ]; then ${HOST_PREFIX}depmod-${KERNEL_MAJOR_VERSION} -A -b $D -F ${STAGING_KERNEL_DIR}/System.map-${KERNEL_VERSION} ${KERNEL_VERSION} else - depmod -a + depmod -a ${KERNEL_VERSION} update-modules || true fi } -- cgit v1.2.3 From f83598d5154e9ce84a73de982c7ac494d797794d Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Mon, 8 Mar 2010 21:51:15 +0000 Subject: base.bbclass: provide shortcut syntax for first anonymous entry in SRC_URI --- classes/base.bbclass | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'classes') diff --git a/classes/base.bbclass b/classes/base.bbclass index c083d48d85..bbc1cc78dc 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -61,10 +61,14 @@ def base_chk_file_vars(parser, localpath, params, data): name = params["name"] except KeyError: return False - flagName = "%s.md5sum" % name - want_md5sum = bb.data.getVarFlag("SRC_URI", flagName, data) - flagName = "%s.sha256sum" % name - want_sha256sum = bb.data.getVarFlag("SRC_URI", flagName, data) + if name: + md5flag = "%s.md5sum" % name + sha256flag = "%s.sha256sum" % name + else: + md5flag = "md5sum" + sha256flag = "sha256sum" + want_md5sum = bb.data.getVarFlag("SRC_URI", md5flag, data) + want_sha256sum = bb.data.getVarFlag("SRC_URI", sha256flag, data) if (want_sha256sum == None and want_md5sum == None): # no checksums to check, nothing to do @@ -702,12 +706,18 @@ python base_do_fetch() { pn = bb.data.getVar('PN', d, True) # Check each URI + first_uri = True for url in src_uri.split(): localpath = bb.data.expand(bb.fetch.localpath(url, localdata), localdata) (type,host,path,_,_,params) = bb.decodeurl(url) uri = "%s://%s%s" % (type,host,path) try: if type in [ "http", "https", "ftp", "ftps" ]: + # We provide a default shortcut of plain [] for the first fetch uri + # Explicit names in any uri overrides this default. + if not "name" in params and first_uri: + first_uri = False + params["name"] = "" if not (base_chk_file_vars(parser, localpath, params, d) or base_chk_file(parser, pn, pv,uri, localpath, d)): if not bb.data.getVar("OE_ALLOW_INSECURE_DOWNLOADS", d, True): bb.fatal("%s-%s: %s has no checksum defined, cannot check archive integrity" % (pn,pv,uri)) -- cgit v1.2.3 From c77f216ab2a518229795b4ee42f76372df93fe7c Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Mon, 8 Mar 2010 15:23:11 -0700 Subject: package_ipk: ensure pkgdest/root dirs exist before the lockfile/chdir Signed-off-by: Chris Larson --- classes/package_ipk.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 420c892f10..410fee30cc 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -159,11 +159,14 @@ python do_package_ipk () { if os.access(os.path.join(tmpdir, "stamps", "IPK_PACKAGE_INDEX_CLEAN"), os.R_OK): os.unlink(os.path.join(tmpdir, "stamps", "IPK_PACKAGE_INDEX_CLEAN")) + pkgdest = bb.data.getVar('PKGDEST', d, 1) + bb.mkdirhier(pkgdest) + packages = bb.data.getVar('PACKAGES', d, True) for pkg in packages.split(): localdata = bb.data.createCopy(d) - pkgdest = bb.data.getVar('PKGDEST', d, 1) root = "%s/%s" % (pkgdest, pkg) + bb.mkdirhier(root) lf = bb.utils.lockfile(root + ".lock") -- cgit v1.2.3 From 44ecf674747fef9f71f928660b394ca470a135fc Mon Sep 17 00:00:00 2001 From: Roman I Khimov Date: Mon, 8 Mar 2010 17:00:58 +0300 Subject: sanity: remove /proc/sys/vm/mmap_min_addr check Binary locale generation fails on openSUSE 11.2 and probably would fail on some other hosts with 2.6.31+ kernels since mmap-ing page zero may be forbidden for security reasons even with /proc/sys/vm/mmap_min_addr set to 0 (this also affects Ubuntu 9.10, although it's been fixed there: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/423513 ). This is not a problem for recently introduced qemu 0.12.3 since it can relocate binaries now, which is tested on openSUSE 2.6.31 kernel with mmap_min_addr=65536 and Debian lenny 2.6.26 with mmap_min_addr set to 0, 4096, 65536. Given that, this check is just useless. Unfortunately, it also means that for reliable builds we have to remove qemu 0.10 which can't work with some kernels. Patch will follow to do that. Signed-off-by: Roman I Khimov Acked-by: Tom Rini Acked-by: Koen Kooi Acked-by: Marcin Juszkiewicz --- classes/sanity.bbclass | 9 --------- 1 file changed, 9 deletions(-) (limited to 'classes') diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index 5f0e724456..19310cbd9c 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -99,15 +99,6 @@ def check_sanity(e): if "qemu-native" in assume_provided: required_utilities += " %s" % (qemu_target_binary(e.data)) - try: - if os.path.exists("/proc/sys/vm/mmap_min_addr"): - f = file("/proc/sys/vm/mmap_min_addr", "r") - if (f.read().strip() != "0"): - messages = messages + "/proc/sys/vm/mmap_min_addr is not 0. This will cause problems with qemu so please fix the value (as root).\n\nTo fix this in later reboots, set vm.mmap_min_addr = 0 in /etc/sysctl.conf.\n" - f.close() - except: - pass - for util in required_utilities.split(): if not check_app_exists( util, e.data ): missing = missing + "%s," % util -- cgit v1.2.3 From 677630b31b8ce4bd8cb723a4c66414739c9d4331 Mon Sep 17 00:00:00 2001 From: Roman I Khimov Date: Mon, 8 Mar 2010 18:27:13 +0300 Subject: qemu: remove 0.9.x QEMU 0.9.x is obsolete this days and with all modifications made for QEMU 0.10.x in OE, versions 0.9.x are unusable anyway. 0.10.3 was introduced 10 month ago, so a good transition time was also given. Now it's time to just kill it. Also remove cvs and svn versions since those are 0.9.x leftovers and QEMU moved to git long ago. Also remove gcc3 checks since that are not relevant for QEMU 0.10+. Also remove from icecc blacklist, since QEMU builds fine with it and the reason for blacklisting was GCC 3. Signed-off-by: Roman I Khimov Acked-by: Tom Rini Acked-by: Koen Kooi Acked-by: Marcin Juszkiewicz --- classes/icecc.bbclass | 2 +- classes/qemu.bbclass | 12 ------------ classes/sanity.bbclass | 9 --------- 3 files changed, 1 insertion(+), 22 deletions(-) (limited to 'classes') diff --git a/classes/icecc.bbclass b/classes/icecc.bbclass index 8e539db0b8..fb6045d21b 100644 --- a/classes/icecc.bbclass +++ b/classes/icecc.bbclass @@ -250,7 +250,7 @@ def icc_path(bb,d): #"system" package blacklist contains a list of packages that can not distribute compile tasks #for one reason or the other - system_package_blacklist = [ "uclibc", "glibc", "gcc", "qemu", "bind", "u-boot", "dhcp-forwarder", "enchant", "connman" ] + system_package_blacklist = [ "uclibc", "glibc", "gcc", "bind", "u-boot", "dhcp-forwarder", "enchant", "connman" ] user_package_blacklist = (bb.data.getVar('ICECC_USER_PACKAGE_BL', d) or "").split() package_blacklist = system_package_blacklist + user_package_blacklist diff --git a/classes/qemu.bbclass b/classes/qemu.bbclass index 40a3542450..66dfb2b0d2 100644 --- a/classes/qemu.bbclass +++ b/classes/qemu.bbclass @@ -3,18 +3,6 @@ # existance. # -def check_gcc3(data): - # Used by qemu to make sure we have a workable gcc-3.x. - # Start by checking for the program name as we build it as there - # are some distribtuion provided gcc-3.x's that will not work. - gcc3_versions = 'gcc-3.4.6 gcc-3.4.4 gcc34 gcc-3.4 gcc-3.4.7 gcc-3.3 gcc33 gcc-3.3.6 gcc-3.2 gcc32' - - for gcc3 in gcc3_versions.split(): - if check_app_exists(gcc3, data): - return gcc3 - - return False - def qemu_target_binary(data): import bb diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index 19310cbd9c..e8b6587500 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -87,15 +87,6 @@ def check_sanity(e): # If we'll be running qemu, perform some sanity checks if data.getVar('ENABLE_BINARY_LOCALE_GENERATION', e.data, True): - # Some versions of qemu-native needs gcc 3.x. Do a special - # check here to allow for host 'gcc' is 3.x. - if "qemu-native" not in assume_provided and "gcc3-native" in assume_provided: - gcc_version = commands.getoutput("${BUILD_PREFIX}gcc --version | head -n 1 | cut -f 3 -d ' '") - - if not check_gcc3(e.data) and gcc_version[0] != '3': - messages = messages + "gcc3-native was in ASSUME_PROVIDED but the gcc-3.x binary can't be found in PATH" - missing = missing + "gcc-3.x (needed for qemu-native)," - if "qemu-native" in assume_provided: required_utilities += " %s" % (qemu_target_binary(e.data)) -- cgit v1.2.3 From abfc008565af32d79f66c3d676ec8eb75d2f12d5 Mon Sep 17 00:00:00 2001 From: Steffen Sledz Date: Wed, 10 Mar 2010 10:25:37 +0100 Subject: bitbake.conf: introducing new image fstype .cpio.gz.u-boot * initrd images need to be prepared with mkimage to be usable from u-boot Signed-off-by: Steffen Sledz Acked-by: Martyn Welch Acked-by: Tom Rini --- classes/image.bbclass | 1 + 1 file changed, 1 insertion(+) (limited to 'classes') diff --git a/classes/image.bbclass b/classes/image.bbclass index 9dce609733..8e202f0665 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -1,4 +1,5 @@ inherit rootfs_${IMAGE_PKGTYPE} +inherit kernel-arch LICENSE = "MIT" PACKAGES = "" -- cgit v1.2.3 From a9089155a6d877655230bb264f121a8db5b904fd Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Thu, 11 Mar 2010 11:29:34 +0000 Subject: base: also stage ${sysconfdir} --- classes/base.bbclass | 1 + 1 file changed, 1 insertion(+) (limited to 'classes') diff --git a/classes/base.bbclass b/classes/base.bbclass index bbc1cc78dc..a94fa2723b 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -1100,6 +1100,7 @@ sysroot_stage_dirs() { sysroot_stage_libdir $from${base_libdir} $to${STAGING_DIR_HOST}${base_libdir} fi sysroot_stage_dir $from${datadir} $to${STAGING_DATADIR} + sysroot_stage_dir $from${sysconfdir} $to${sysconfdir} } sysroot_stage_all() { -- cgit v1.2.3 From d25468cd60dae85af234ebd998eb3626893949bd Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 11 Mar 2010 16:40:57 +0100 Subject: base: don't write to system /etc dir, use new STAGING_ETCDIR instead * ETCDIR instead SYSCONFDIR, because there already was STAGING_ETCDIR_NATIVE Signed-off-by: Martin Jansa --- classes/base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/base.bbclass b/classes/base.bbclass index a94fa2723b..b191940038 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -1100,7 +1100,7 @@ sysroot_stage_dirs() { sysroot_stage_libdir $from${base_libdir} $to${STAGING_DIR_HOST}${base_libdir} fi sysroot_stage_dir $from${datadir} $to${STAGING_DATADIR} - sysroot_stage_dir $from${sysconfdir} $to${sysconfdir} + sysroot_stage_dir $from${sysconfdir} $to${STAGING_ETCDIR} } sysroot_stage_all() { -- cgit v1.2.3 From 548aea3b52f68af8da7f8fbd8067fc4600c8526b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 23 Oct 2008 21:08:42 +0100 Subject: base.bbclass/bitbake.conf: Fix some string quoting to handle more unusual URLs (from Poky) --- classes/base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/base.bbclass b/classes/base.bbclass index b191940038..a54e6992b6 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -813,7 +813,7 @@ def oe_unpack_file(file, data, url = None): (type, host, path, user, pswd, parm) = bb.decodeurl(url) if 'dos' in parm: cmd = '%s -a' % cmd - cmd = '%s %s' % (cmd, file) + cmd = "%s '%s'" % (cmd, file) elif os.path.isdir(file): destdir = "." filespath = bb.data.getVar("FILESPATH", data, 1).split(":") -- cgit v1.2.3 From f362c9bb1ec5a010917a155b1649de890720d9c8 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 15 Mar 2010 07:55:49 +0100 Subject: base.bbclass: fix quoting for md5/sha256 checksums checking Signed-off-by: Marcin Juszkiewicz --- classes/base.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'classes') diff --git a/classes/base.bbclass b/classes/base.bbclass index a54e6992b6..2f363127c6 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -81,7 +81,7 @@ def base_chk_file_vars(parser, localpath, params, data): if want_md5sum: try: - md5pipe = os.popen('PATH=%s md5sum %s' % (bb.data.getVar('PATH', data, True), localpath)) + md5pipe = os.popen('PATH=%s md5sum "%s"' % (bb.data.getVar('PATH', data, True), localpath)) md5data = (md5pipe.readline().split() or [ "" ])[0] md5pipe.close() except OSError, e: @@ -92,7 +92,7 @@ def base_chk_file_vars(parser, localpath, params, data): if want_sha256sum: try: - shapipe = os.popen('PATH=%s oe_sha256sum %s' % (bb.data.getVar('PATH', data, True), localpath)) + shapipe = os.popen('PATH=%s oe_sha256sum "%s"' % (bb.data.getVar('PATH', data, True), localpath)) sha256data = (shapipe.readline().split() or [ "" ])[0] shapipe.close() except OSError, e: @@ -131,14 +131,14 @@ def base_chk_file(parser, pn, pv, src_uri, localpath, data): # call md5(sum) and shasum try: - md5pipe = os.popen('PATH=%s md5sum %s' % (bb.data.getVar('PATH', data, True), localpath)) + md5pipe = os.popen('PATH=%s md5sum "%s"' % (bb.data.getVar('PATH', data, True), localpath)) md5data = (md5pipe.readline().split() or [ "" ])[0] md5pipe.close() except OSError: raise Exception("Executing md5sum failed") try: - shapipe = os.popen('PATH=%s oe_sha256sum %s' % (bb.data.getVar('PATH', data, True), localpath)) + shapipe = os.popen('PATH=%s oe_sha256sum "%s"' % (bb.data.getVar('PATH', data, True), localpath)) shadata = (shapipe.readline().split() or [ "" ])[0] shapipe.close() except OSError: -- cgit v1.2.3 From a9ecfad820594837aa3a0610b7d718c5dd8904dd Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 15 Mar 2010 08:05:41 +0100 Subject: src_distribute_local: fix quoting Signed-off-by: Marcin Juszkiewicz --- classes/src_distribute_local.bbclass | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'classes') diff --git a/classes/src_distribute_local.bbclass b/classes/src_distribute_local.bbclass index 5cec2880aa..8cf0b426c0 100644 --- a/classes/src_distribute_local.bbclass +++ b/classes/src_distribute_local.bbclass @@ -6,24 +6,24 @@ SRC_DISTRIBUTECOMMAND[dirs] = "${SRC_DISTRIBUTEDIR}/${LIC}/${PN}" # symlinks the files to the SRC_DISTRIBUTEDIR SRC_DISTRIBUTECOMMAND-symlink () { - test -e ${SRC}.md5 && ln -sf ${SRC}.md5 . - ln -sf ${SRC} . + test -e "${SRC}.md5" && ln -sf "${SRC}.md5" . + ln -sf "${SRC}" . } # copies the files to the SRC_DISTRIBUTEDIR SRC_DISTRIBUTECOMMAND-copy () { - test -e ${SRC}.md5 && cp -f ${SRC}.md5 . - cp -fr ${SRC} . + test -e "${SRC}.md5" && cp -f "${SRC}.md5" . + cp -fr "${SRC}" . } # moves the files to the SRC_DISTRIBUTEDIR and symlinks them back SRC_DISTRIBUTECOMMAND-move+symlink () { if ! [ -L ${SRC} ]; then mv ${SRC} . - ln -sf $PWD/`basename ${SRC}` ${SRC} + ln -sf $PWD/`basename "${SRC}"` "${SRC}" if [ -e ${SRC}.md5 ]; then mv ${SRC}.md5 . - ln -sf $PWD/`basename ${SRC}.md5` ${SRC}.md5 + ln -sf $PWD/`basename "${SRC}.md5"` "${SRC}.md5" fi fi } -- cgit v1.2.3 From 9b67465cea384186375d9a31ad498176f7d59de6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 15 Mar 2010 16:07:07 +0100 Subject: sourcepkg.bbclass: put files in ${PN} subdir to avoid cluttering up the dir and generate diff *after* configure to pick up e.g. sed magic as well --- classes/sourcepkg.bbclass | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'classes') diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass index 5aacf92d10..e11f72b6dd 100644 --- a/classes/sourcepkg.bbclass +++ b/classes/sourcepkg.bbclass @@ -30,7 +30,7 @@ def get_src_tree(d): sourcepkg_do_create_orig_tgz(){ - mkdir -p ${DEPLOY_DIR_SRC} + mkdir -p ${DEPLOY_DIR_SRC}/${PN} cd ${WORKDIR} for i in ${EXCLUDE_FROM}; do echo $i >> temp/exclude-from-file @@ -39,8 +39,8 @@ sourcepkg_do_create_orig_tgz(){ src_tree=${@get_src_tree(d)} echo $src_tree - oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz" - tar cvzf ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz --exclude-from temp/exclude-from-file $src_tree + oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${PN}/${P}.orig.tar.gz" + tar cvzf ${DEPLOY_DIR_SRC}/${PN}/${P}.orig.tar.gz --exclude-from temp/exclude-from-file $src_tree cp -pPR $src_tree $src_tree.orig } @@ -93,20 +93,20 @@ sourcepkg_do_create_diff_gz(){ cp $i $src_tree/${DISTRO}/files done - oenote "Creating .diff.gz in ${DEPLOY_DIR_SRC}/${P}-${PR}.diff.gz" - LC_ALL=C TZ=UTC0 diff --exclude-from=temp/exclude-from-file -Naur $src_tree.orig $src_tree | gzip -c > ${DEPLOY_DIR_SRC}/${P}-${PR}.diff.gz + oenote "Creating .diff.gz in ${DEPLOY_DIR_SRC}/${PN}/${P}-${PR}.diff.gz" + LC_