summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/classes/insane.bbclass65
-rw-r--r--meta/packages/linux/files/1300-fix-gcc-4.3-false-modulo-optimization.patch.patch48
-rw-r--r--meta/packages/linux/files/sumversion-fix.patch16
-rw-r--r--meta/packages/linux/linux-mx31.inc2
-rw-r--r--meta/packages/linux/linux-mx31_2.6.19.2.bb3
-rw-r--r--meta/packages/linux/linux-mx31_2.6.22.6.bb3
-rw-r--r--meta/packages/linux/linux-nokia800.inc2
-rw-r--r--meta/packages/linux/linux-nokia800_2.6.18-osso40.bb5
-rw-r--r--meta/packages/linux/linux-nokia800_2.6.21-osso71.bb9
-rw-r--r--meta/packages/linux/linux-rp_2.6.23.bb3
-rw-r--r--meta/packages/linux/linux_2.6.23.bb5
-rw-r--r--meta/packages/zlib/zlib_1.2.3.bb2
-rwxr-xr-xscripts/poky-env-internal2
13 files changed, 150 insertions, 15 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 6d82e4df8..0c9bde349 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -266,6 +266,68 @@ def package_qa_check_buildpaths(path, name, d):
sane = package_qa_handle_error(9, error_msg, name, path, d)
return sane
+def package_qa_check_license(workdir, d):
+ """
+ Check for changes in the license files
+ """
+ import tempfile
+ sane = True
+
+ lic_files = bb.data.getVar('LIC_FILES_CHKSUM', d, True)
+
+ if not lic_files:
+ # just throw a warning now. Once licensing data in entered for enough of the recipes,
+ # this will be converted into error and False will be returned.
+ bb.warn(" Recipe (.bb) file does not have license file information (LIC_FILES_CHKSUM)")
+ return True
+
+ srcdir = bb.data.getVar('S', d, True)
+
+ for url in lic_files.split():
+ (type, host, path, user, pswd, parm) = bb.decodeurl(url)
+ srclicfile = os.path.join(srcdir, path)
+
+ if 'md5' not in parm:
+ bb.error("md5 checksum is not specified for ", url)
+ return False
+ beginline, endline = 0, 0
+ if 'beginline' in parm:
+ beginline = int(parm['beginline'])
+ if 'endline' in parm:
+ endline = int(parm['endline'])
+
+ if (not beginline) and (not endline):
+ md5chksum = bb.utils.md5_file(srclicfile)
+ else:
+ fi = open(srclicfile, 'r')
+ fo = tempfile.NamedTemporaryFile(mode='wb', prefix='poky.', suffix='.tmp', delete=False)
+ tmplicfile = fo.name;
+ lineno = 0
+ linesout = 0
+ for line in fi:
+ lineno += 1
+ if (lineno >= beginline):
+ if ((lineno <= endline) or not endline):
+ fo.write(line)
+ linesout += 1
+ else:
+ break
+ fo.flush()
+ fo.close()
+ fi.close()
+ md5chksum = bb.utils.md5_file(tmplicfile)
+ os.unlink(tmplicfile)
+
+ if parm['md5'] == md5chksum:
+ bb.note ("md5 checksum matched for ", url)
+ else:
+ bb.error ("md5 data is not matching for ", url)
+ bb.note ("The new md5 checksum is ", md5chksum)
+ bb.note ("Check if the license information has changed, and if it has update the .bb file with correct license")
+ return False
+
+ return sane
+
def package_qa_check_staged(path,d):
"""
Check staged la and pc files for sanity
@@ -385,7 +447,8 @@ python do_package_qa () {
if not package_qa_check_rdepends(package, workdir, d):
rdepends_sane = False
- if not walk_sane or not rdepends_sane:
+
+ if not walk_sane or not rdepends_sane or not package_qa_check_license(workdir, d):
bb.fatal("QA run found fatal errors. Please consider fixing them.")
bb.note("DONE with PACKAGE QA")
}
diff --git a/meta/packages/linux/files/1300-fix-gcc-4.3-false-modulo-optimization.patch.patch b/meta/packages/linux/files/1300-fix-gcc-4.3-false-modulo-optimization.patch.patch
new file mode 100644
index 000000000..3ff0c07c1
--- /dev/null
+++ b/meta/packages/linux/files/1300-fix-gcc-4.3-false-modulo-optimization.patch.patch
@@ -0,0 +1,48 @@
+From f5b973489beb1a1239dfad53e3ad6e36ff7ee958 Mon Sep 17 00:00:00 2001
+From: Segher Boessenkool <segher@kernel.crashing.org>
+Date: Thu, 9 Oct 2008 21:18:27 +0100
+Subject: [PATCH] fix-gcc-4.3-false-modulo-optimization.patch
+
+I tried to compile the current stable kernel
+(a2ef813d2f439a3e9f377d33a2e5baad098afb7e)
+and get the following errors:
+
+kernel/built-in.o: In function `timespec_add_ns':
+/mnt/data/Freerunner/Gentoo/rootinstall/usr/src/linux/include/linux/time.h:174:
+undefined reference to `__aeabi_uldivmod'
+/mnt/data/Freerunner/Gentoo/rootinstall/usr/src/linux/include/linux/time.h:179:
+undefined reference to `__aeabi_uldivmod'
+/mnt/data/Freerunner/Gentoo/rootinstall/usr/src/linux/include/linux/time.h:174:
+undefined reference to `__aeabi_uldivmod'
+/mnt/data/Freerunner/Gentoo/rootinstall/usr/src/linux/include/linux/time.h:179:
+undefined reference to `__aeabi_uldivmod'
+
+applying the following patch solved the problem:
+--------
+Prevent gcc-4.3 form "optimizing" the while loop into a costly modulo operation.
+Patch found at http://lkml.org/lkml/2008/2/22/464.
+
+Reported-by: Sven Rebhan <odinshorse@googlemail.com>
+Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
+---
+ include/linux/time.h | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/include/linux/time.h b/include/linux/time.h
+index b04136d..3e8fd9e 100644
+--- a/include/linux/time.h
++++ b/include/linux/time.h
+@@ -173,6 +173,10 @@ static inline void timespec_add_ns(struct timespec *a, u64 ns)
+ {
+ ns += a->tv_nsec;
+ while(unlikely(ns >= NSEC_PER_SEC)) {
++ /* The following asm() prevents the compiler from
++ * optimising this loop into a modulo operation. */
++ asm("" : "+r"(ns));
++
+ ns -= NSEC_PER_SEC;
+ a->tv_sec++;
+ }
+--
+1.5.6.5
+
diff --git a/meta/packages/linux/files/sumversion-fix.patch b/meta/packages/linux/files/sumversion-fix.patch
new file mode 100644
index 000000000..8158d9d5f
--- /dev/null
+++ b/meta/packages/linux/files/sumversion-fix.patch
@@ -0,0 +1,16 @@
+Fix compilation of the sumversion "script"
+
+http://bugs.gentoo.org/show_bug.cgi?format=multiple&id=226169
+
+Index: linux-2.6.21/scripts/mod/sumversion.c
+===================================================================
+--- linux-2.6.21.orig/scripts/mod/sumversion.c 2007-04-26 04:08:32.000000000 +0100
++++ linux-2.6.21/scripts/mod/sumversion.c 2010-05-13 14:41:31.777882280 +0100
+@@ -7,6 +7,7 @@
+ #include <ctype.h>
+ #include <errno.h>
+ #include <string.h>
++#include <limits.h>
+ #include "modpost.h"
+
+ /*
diff --git a/meta/packages/linux/linux-mx31.inc b/meta/packages/linux/linux-mx31.inc
index 7df02c9b2..0f83ac7a4 100644
--- a/meta/packages/linux/linux-mx31.inc
+++ b/meta/packages/linux/linux-mx31.inc
@@ -2,7 +2,7 @@ SECTION = "kernel"
DESCRIPTION = "Linux kernel for imx31 devices"
LICENSE = "GPL"
-KERNEL_OUTPUT = "arch/${ARCH}/boot/compressed/${KERNEL_IMAGETYPE}"
+KERNEL_OUTPUT = "arch/${ARCH}/boot/${KERNEL_IMAGETYPE}"
inherit kernel
diff --git a/meta/packages/linux/linux-mx31_2.6.19.2.bb b/meta/packages/linux/linux-mx31_2.6.19.2.bb
index 8394bc417..56d111e2f 100644
--- a/meta/packages/linux/linux-mx31_2.6.19.2.bb
+++ b/meta/packages/linux/linux-mx31_2.6.19.2.bb
@@ -1,10 +1,11 @@
require linux-mx31.inc
-PR = "r7"
+PR = "r8"
FILESDIR = "${WORKDIR}"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.19.2.tar.bz2 \
+ file://sumversion-fix.patch;patch=1 \
file://defconfig-mx31litekit \
file://defconfig-mx31ads \
file://defconfig-mx31phy \
diff --git a/meta/packages/linux/linux-mx31_2.6.22.6.bb b/meta/packages/linux/linux-mx31_2.6.22.6.bb
index 299e40653..d19a02fa0 100644
--- a/meta/packages/linux/linux-mx31_2.6.22.6.bb
+++ b/meta/packages/linux/linux-mx31_2.6.22.6.bb
@@ -1,10 +1,11 @@
require linux-mx31.inc
-PR = "r4"
+PR = "r5"
FILESDIR = "${WORKDIR}"
SRC_URI = " \
${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.22.6.tar.bz2 \
+ file://1300-fix-gcc-4.3-false-modulo-optimization.patch.patch;patch=1 \
file://defconfig-mx31ads \
file://defconfig-mx31phy \
"
diff --git a/meta/packages/linux/linux-nokia800.inc b/meta/packages/linux/linux-nokia800.inc
index d373e4c90..a9505fab5 100644
--- a/meta/packages/linux/linux-nokia800.inc
+++ b/meta/packages/linux/linux-nokia800.inc
@@ -2,7 +2,7 @@ SECTION = "kernel"
DESCRIPTION = "Linux kernel for Nokia 770/800"
LICENSE = "GPL"
-KERNEL_OUTPUT = "arch/${ARCH}/boot/compressed/${KERNEL_IMAGETYPE}"
+KERNEL_OUTPUT = "arch/${ARCH}/boot/${KERNEL_IMAGETYPE}"
KERNEL_CCSUFFIX = "-3.4.4+csl-arm-2005q3-2"
inherit kernel
diff --git a/meta/packages/linux/linux-nokia800_2.6.18-osso40.bb b/meta/packages/linux/linux-nokia800_2.6.18-osso40.bb
index 13c2e8f4a..f987ab321 100644
--- a/meta/packages/linux/linux-nokia800_2.6.18-osso40.bb
+++ b/meta/packages/linux/linux-nokia800_2.6.18-osso40.bb
@@ -1,6 +1,6 @@
require linux-nokia800.inc
-PR = "r6"
+PR = "r7"
SRC_URI = "http://repository.maemo.org/pool/maemo3.1/free/source/kernel-source-rx-34_2.6.18.orig.tar.gz \
http://repository.maemo.org/pool/maemo3.1/free/source/kernel-source-rx-34_2.6.18-osso40.diff.gz;patch=1 \
${RPSRC}/lzo_kernel-r0.patch;patch=1 \
@@ -9,7 +9,8 @@ SRC_URI = "http://repository.maemo.org/pool/maemo3.1/free/source/kernel-source-r
${RPSRC}/lzo_jffs2_lzomode-r0.patch;patch=1 \
${RPSRC}/lzo_jffs2_sysfs-r0.patch;patch=1 \
file://fix_oprofile.patch;patch=1 \
- file://defconfig"
+ file://sumversion-fix.patch;patch=1 \
+ file://defconfig"
SRC_URI_append_nokia770 = " file://nokia770_nand_fix.patch;patch=1"
diff --git a/meta/packages/linux/linux-nokia800_2.6.21-osso71.bb b/meta/packages/linux/linux-nokia800_2.6.21-osso71.bb
index aca644087..b64c697c9 100644
--- a/meta/packages/linux/linux-nokia800_2.6.21-osso71.bb
+++ b/meta/packages/linux/linux-nokia800_2.6.21-osso71.bb
@@ -1,13 +1,14 @@
require linux-nokia800.inc
-PR = "r4"
+PR = "r5"
DEFAULT_PREFERENCE_nokia770 = "-1"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.21.tar.bz2 \
- http://repository.maemo.org/pool/os2008/free/source/k/kernel-source-rx-34/kernel-source-rx-34_2.6.21.0-osso71.diff.gz;patch=1 \
+ http://repository.maemo.org/pool/os2008/free/source/k/kernel-source-rx-34/kernel-source-rx-34_2.6.21.0-osso71.diff.gz;patch=1 \
http://www.rpsys.net/openzaurus/patches/archive/input_power-r7.patch;patch=1 \
- file://suspend-button.patch;patch=1 \
- file://defconfig"
+ file://suspend-button.patch;patch=1 \
+ file://sumversion-fix.patch;patch=1 \
+ file://defconfig"
S = "${WORKDIR}/linux-2.6.21"
diff --git a/meta/packages/linux/linux-rp_2.6.23.bb b/meta/packages/linux/linux-rp_2.6.23.bb
index 2293eea80..0c67fd4ea 100644
--- a/meta/packages/linux/linux-rp_2.6.23.bb
+++ b/meta/packages/linux/linux-rp_2.6.23.bb
@@ -1,6 +1,6 @@
require linux-rp.inc
-PR = "r35"
+PR = "r36"
# Handy URLs
# git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=ef7d1b244fa6c94fb76d5f787b8629df64ea4046
@@ -60,6 +60,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
file://htcuni.patch;patch=1 \
file://binutils-buildid-arm.patch;patch=1 \
file://versatile-armv6.patch;patch=1 \
+ file://1300-fix-gcc-4.3-false-modulo-optimization.patch.patch;patch=1 \
file://defconfig-c7x0 \
file://defconfig-hx2000 \
file://defconfig-collie \
diff --git a/meta/packages/linux/linux_2.6.23.bb b/meta/packages/linux/linux_2.6.23.bb
index a517defd0..5d5c21b9d 100644
--- a/meta/packages/linux/linux_2.6.23.bb
+++ b/meta/packages/linux/linux_2.6.23.bb
@@ -7,10 +7,11 @@ DEFAULT_PREFERENCE_em-x270 = "1"
DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
DEFAULT_PREFERENCE_mpc8323e-rdb = "1"
-PR = "r6"
+PR = "r7"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
- file://binutils-buildid-arm.patch;patch=1 \
+ file://binutils-buildid-arm.patch;patch=1 \
+ file://1300-fix-gcc-4.3-false-modulo-optimization.patch.patch;patch=1 \
file://defconfig \
"
diff --git a/meta/packages/zlib/zlib_1.2.3.bb b/meta/packages/zlib/zlib_1.2.3.bb
index 97d0be5d5..c58d5f2d2 100644
--- a/meta/packages/zlib/zlib_1.2.3.bb
+++ b/meta/packages/zlib/zlib_1.2.3.bb
@@ -3,6 +3,8 @@ SECTION = "libs"
PRIORITY = "required"
HOMEPAGE = "http://www.gzip.org/zlib/"
LICENSE = "zlib"
+LIC_FILES_CHKSUM = "file://README;md5=ae764cfda68da96df20af9fbf9fe49bd \
+ file://zlib.h;beginline=1;endline=30;md5=6ab03f03a5ee92d06b809797d4d5586d "
PR = "r7"
SRC_URI = "http://www.zlib.net/zlib-1.2.3.tar.bz2 \
diff --git a/scripts/poky-env-internal b/scripts/poky-env-internal
index 7ffd25f91..c91811d59 100755
--- a/scripts/poky-env-internal
+++ b/scripts/poky-env-internal
@@ -53,7 +53,7 @@ do
if [ -e $OEROOT/$repo/poky-extra-environment ]; then
. $OEROOT/$repo/poky-extra-environment
fi
- #BBPATH=" $BBPATH $OEROOT/$repo"
+ BBPATH=" $BBPATH $OEROOT/$repo"
done
BBPATH="$BBPATH $HOME/.oe $HOME/.poky $BUILDDIR"
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-10 15:49:31 +0000