* [CONSOLIDATED PULL 1/6] default-providers: add kbd as PREFERRED_PROVIDER for console-tools
2012-01-27 17:15 [CONSOLIDATED PULL 0/6] Various patches from the list Saul Wold
@ 2012-01-27 17:15 ` Saul Wold
2012-01-27 17:15 ` [CONSOLIDATED PULL 2/6] gcc-runtime: fix override from poky-lsb to linuxstdbase Saul Wold
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Saul Wold @ 2012-01-27 17:15 UTC (permalink / raw)
To: openembedded-core
kbd is used a primary provider for console-tools
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/conf/distro/include/default-providers.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index efa8117..667f3ba 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -32,4 +32,4 @@ PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2"
PREFERRED_PROVIDER_opkg ?= "opkg"
PREFERRED_PROVIDER_opkg-native ?= "opkg-native"
PREFERRED_PROVIDER_opkg-nativesdk ?= "opkg-nativesdk"
-
+PREFERRED_PROVIDER_console-tools ?= "kbd"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* [CONSOLIDATED PULL 2/6] gcc-runtime: fix override from poky-lsb to linuxstdbase
2012-01-27 17:15 [CONSOLIDATED PULL 0/6] Various patches from the list Saul Wold
2012-01-27 17:15 ` [CONSOLIDATED PULL 1/6] default-providers: add kbd as PREFERRED_PROVIDER for console-tools Saul Wold
@ 2012-01-27 17:15 ` Saul Wold
2012-01-27 17:15 ` [CONSOLIDATED PULL 3/6] rootfs_ipk: remove runtime_script_required usage Saul Wold
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Saul Wold @ 2012-01-27 17:15 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-devtools/gcc/gcc-runtime_4.6.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-runtime_4.6.bb b/meta/recipes-devtools/gcc/gcc-runtime_4.6.bb
index 97468db..a2fb200 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime_4.6.bb
+++ b/meta/recipes-devtools/gcc/gcc-runtime_4.6.bb
@@ -5,4 +5,4 @@ require gcc-package-runtime.inc
ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
EXTRA_OECONF += "--disable-libunwind-exceptions"
-EXTRA_OECONF_append_poky-lsb = " --enable-clocale=gnu"
+EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* [CONSOLIDATED PULL 3/6] rootfs_ipk: remove runtime_script_required usage
2012-01-27 17:15 [CONSOLIDATED PULL 0/6] Various patches from the list Saul Wold
2012-01-27 17:15 ` [CONSOLIDATED PULL 1/6] default-providers: add kbd as PREFERRED_PROVIDER for console-tools Saul Wold
2012-01-27 17:15 ` [CONSOLIDATED PULL 2/6] gcc-runtime: fix override from poky-lsb to linuxstdbase Saul Wold
@ 2012-01-27 17:15 ` Saul Wold
2012-01-27 17:15 ` [CONSOLIDATED PULL 4/6] image_types.bbclass: refactor cpio images generation Saul Wold
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Saul Wold @ 2012-01-27 17:15 UTC (permalink / raw)
To: openembedded-core
From: Martin Jansa <martin.jansa@gmail.com>
* it was introduced in 87780fc09b066525e47d0f50ee5497db54d304cd
* then partially removed in 2feba313c991170747381c7cf821a45c2cd04632
* so remove this use too as runtime_script_required is not initialized anymore and results in
run.do_rootfs.6328: line 235: [: -eq: unary operator expected
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/classes/rootfs_ipk.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index 48fb2fb..5342035 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -90,7 +90,7 @@ fakeroot rootfs_ipk_do_rootfs () {
rm -f ${IMAGE_ROOTFS}${opkglibdir}/lists/*
if ${@base_contains("IMAGE_FEATURES", "package-management", "false", "true", d)}; then
- if [ $runtime_script_required -eq 0 ]; then
+ if ! grep Status:.install.ok.unpacked ${IMAGE_ROOTFS}${opkglibdir}status; then
# All packages were successfully configured.
# update-rc.d, base-passwd are no further use, remove them now
opkg-cl ${IPKG_ARGS} --force-depends remove update-rc.d base-passwd || true
--
1.7.6.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* [CONSOLIDATED PULL 4/6] image_types.bbclass: refactor cpio images generation.
2012-01-27 17:15 [CONSOLIDATED PULL 0/6] Various patches from the list Saul Wold
` (2 preceding siblings ...)
2012-01-27 17:15 ` [CONSOLIDATED PULL 3/6] rootfs_ipk: remove runtime_script_required usage Saul Wold
@ 2012-01-27 17:15 ` Saul Wold
2012-01-27 17:15 ` [CONSOLIDATED PULL 5/6] genext2fs: fix inode computation Saul Wold
2012-01-27 17:15 ` [CONSOLIDATED PULL 6/6] qt4-tools-nativesdk-4.8.0: fix build Saul Wold
5 siblings, 0 replies; 7+ messages in thread
From: Saul Wold @ 2012-01-27 17:15 UTC (permalink / raw)
To: openembedded-core
From: Andrea Adami <andrea.adami@gmail.com>
* Add common check for the presence of an /init
* symlink, being 'touch' would fail with it
* and 'touch -h' is not yet generally supported
* (depends on distro on build host).
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
meta/classes/image_types.bbclass | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 4908ed9..eef554d 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -115,16 +115,29 @@ IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME
IMAGE_CMD_tar.gz = "cd ${IMAGE_ROOTFS} && tar -zcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.gz ."
IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ."
IMAGE_CMD_tar.xz = "cd ${IMAGE_ROOTFS} && tar --xz -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.xz ."
-IMAGE_CMD_cpio () {
+
+CPIO_TOUCH_INIT () {
+ if [ ! -L ${IMAGE_ROOTFS}/init ]
+ then
touch ${IMAGE_ROOTFS}/init
+ fi
+}
+IMAGE_CMD_cpio () {
+ ${CPIO_TOUCH_INIT}
cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio)
}
IMAGE_CMD_cpio.gz () {
- touch ${IMAGE_ROOTFS}/init
+ ${CPIO_TOUCH_INIT}
cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | gzip -c -9 >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz)
}
-IMAGE_CMD_cpio.xz = "type cpio >/dev/null; cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | xz -c ${XZ_COMPRESSION_LEVEL} --check=${XZ_INTEGRITY_CHECK} > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.xz) ${EXTRA_IMAGECMD}"
-IMAGE_CMD_cpio.lzma = "type cpio >/dev/null; cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | xz --format=lzma -c ${XZ_COMPRESSION_LEVEL} --check=${XZ_INTEGRITY_CHECK} >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.lzma) ${EXTRA_IMAGECMD}"
+IMAGE_CMD_cpio.xz () {
+ ${CPIO_TOUCH_INIT}
+ cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | xz -c ${XZ_COMPRESSION_LEVEL} --check=${XZ_INTEGRITY_CHECK} > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.xz) ${EXTRA_IMAGECMD}
+}
+IMAGE_CMD_cpio.lzma () {
+ ${CPIO_TOUCH_INIT}
+ cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | xz --format=lzma -c ${XZ_COMPRESSION_LEVEL} --check=${XZ_INTEGRITY_CHECK} >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.lzma) ${EXTRA_IMAGECMD}
+}
UBI_VOLNAME ?= "${MACHINE}-rootfs"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* [CONSOLIDATED PULL 5/6] genext2fs: fix inode computation
2012-01-27 17:15 [CONSOLIDATED PULL 0/6] Various patches from the list Saul Wold
` (3 preceding siblings ...)
2012-01-27 17:15 ` [CONSOLIDATED PULL 4/6] image_types.bbclass: refactor cpio images generation Saul Wold
@ 2012-01-27 17:15 ` Saul Wold
2012-01-27 17:15 ` [CONSOLIDATED PULL 6/6] qt4-tools-nativesdk-4.8.0: fix build Saul Wold
5 siblings, 0 replies; 7+ messages in thread
From: Saul Wold @ 2012-01-27 17:15 UTC (permalink / raw)
To: openembedded-core
This patch fixes a problem with the computation of inodes
based on the bytes_per_inode options, for a larger FS (> 2G)
the inode count would go negative and a smaller default
count would be used, this would cause the FS to run out of
inodes.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../genext2fs-1.4.1/fix-nbblocks-cast.patch | 35 ++++++++++++++++++++
meta/recipes-devtools/genext2fs/genext2fs_1.4.1.bb | 4 ++-
2 files changed, 38 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-devtools/genext2fs/genext2fs-1.4.1/fix-nbblocks-cast.patch
diff --git a/meta/recipes-devtools/genext2fs/genext2fs-1.4.1/fix-nbblocks-cast.patch b/meta/recipes-devtools/genext2fs/genext2fs-1.4.1/fix-nbblocks-cast.patch
new file mode 100644
index 0000000..3fd15e0
--- /dev/null
+++ b/meta/recipes-devtools/genext2fs/genext2fs-1.4.1/fix-nbblocks-cast.patch
@@ -0,0 +1,35 @@
+
+This patch fixes up the computation of nbinodes which would go
+negative due to an int overflow issue when nbblocks > 2Meg for
+a 2Gig or greater filesystem.
+
+The computation is now done as a float equation, since both nbblocks
+and bytes_per_inode are no floats, and then cast to int by assignment.
+
+int tmp_nbinodes = nbblocks * BLOCKSIZE / bytes_per_inode;
+
+Upstream-Status: Submitted
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+Index: genext2fs-1.4.1/genext2fs.c
+===================================================================
+--- genext2fs-1.4.1.orig/genext2fs.c
++++ genext2fs-1.4.1/genext2fs.c
+@@ -2447,7 +2447,7 @@ extern int optind, opterr, optopt;
+ int
+ main(int argc, char **argv)
+ {
+- int nbblocks = -1;
++ float nbblocks = -1;
+ int nbinodes = -1;
+ int nbresrvd = -1;
+ float bytes_per_inode = -1;
+@@ -2609,7 +2609,7 @@ main(int argc, char **argv)
+ }
+ if(fs_timestamp == -1)
+ fs_timestamp = time(NULL);
+- fs = init_fs(nbblocks, nbinodes, nbresrvd, holes, fs_timestamp);
++ fs = init_fs((int)nbblocks, nbinodes, nbresrvd, holes, fs_timestamp);
+ }
+
+ populate_fs(fs, dopt, didx, squash_uids, squash_perms, fs_timestamp, NULL);
diff --git a/meta/recipes-devtools/genext2fs/genext2fs_1.4.1.bb b/meta/recipes-devtools/genext2fs/genext2fs_1.4.1.bb
index 9364bb8..012ec6c 100644
--- a/meta/recipes-devtools/genext2fs/genext2fs_1.4.1.bb
+++ b/meta/recipes-devtools/genext2fs/genext2fs_1.4.1.bb
@@ -1,6 +1,8 @@
require genext2fs.inc
-PR = "r0"
+PR = "r1"
+
+SRC_URI += "file://fix-nbblocks-cast.patch"
SRC_URI[md5sum] = "b7b6361bcce2cedff1ae437fadafe53b"
SRC_URI[sha256sum] = "404dbbfa7a86a6c3de8225c8da254d026b17fd288e05cec4df2cc7e1f4feecfc"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 7+ messages in thread* [CONSOLIDATED PULL 6/6] qt4-tools-nativesdk-4.8.0: fix build
2012-01-27 17:15 [CONSOLIDATED PULL 0/6] Various patches from the list Saul Wold
` (4 preceding siblings ...)
2012-01-27 17:15 ` [CONSOLIDATED PULL 5/6] genext2fs: fix inode computation Saul Wold
@ 2012-01-27 17:15 ` Saul Wold
5 siblings, 0 replies; 7+ messages in thread
From: Saul Wold @ 2012-01-27 17:15 UTC (permalink / raw)
To: openembedded-core
From: Eric Bénard <eric@eukrea.com>
the build is actually failing because host g++ and ld are used to
compile and link
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
.../qt4/{files => qt-4.7.4}/configure-lflags.patch | 0
.../recipes-qt/qt4/qt-4.8.0/configure-lflags.patch | 18 ++++++++++++++++++
meta/recipes-qt/qt4/qt4-tools-nativesdk.inc | 10 +++++++---
meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb | 3 ++-
4 files changed, 27 insertions(+), 4 deletions(-)
rename meta/recipes-qt/qt4/{files => qt-4.7.4}/configure-lflags.patch (100%)
create mode 100644 meta/recipes-qt/qt4/qt-4.8.0/configure-lflags.patch
diff --git a/meta/recipes-qt/qt4/files/configure-lflags.patch b/meta/recipes-qt/qt4/qt-4.7.4/configure-lflags.patch
similarity index 100%
rename from meta/recipes-qt/qt4/files/configure-lflags.patch
rename to meta/recipes-qt/qt4/qt-4.7.4/configure-lflags.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/configure-lflags.patch b/meta/recipes-qt/qt4/qt-4.8.0/configure-lflags.patch
new file mode 100644
index 0000000..d74f7fd
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.8.0/configure-lflags.patch
@@ -0,0 +1,18 @@
+qt4-tools-native: set LFLAGS to pick up zlib from staging
+
+Original Author: Jeremy Lainé <jeremy.laine@m4x.org>
+Upstream-Status: Pending
+
+Index: qt-everywhere-opensource-src-4.8.0/configure
+===================================================================
+--- qt-everywhere-opensource-src-4.8.0.orig/configure
++++ qt-everywhere-opensource-src-4.8.0/configure
+@@ -611,7 +611,7 @@ fi
+ # initalize variables
+ #-------------------------------------------------------------------------------
+
+-SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS"
++SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS LFLAGS"
+ for varname in $SYSTEM_VARIABLES; do
+ qmakevarname="${varname}"
+ # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
index 275fdcc..4b097cf 100644
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
@@ -4,7 +4,7 @@ SECTION = "libs"
HOMEPAGE = "http://qt.nokia.com"
LICENSE = "LGPLv2.1 | GPLv3"
-INC_PR = "r7"
+INC_PR = "r8"
FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
@@ -12,7 +12,6 @@ inherit nativesdk qmake2
SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
file://configure-lflags.patch \
- file://compile.test-lflags.patch \
file://qt-config.patch \
file://qmake-exists-check.patch \
file://configure-paths.patch \
@@ -51,12 +50,18 @@ EXTRA_OECONF = "-prefix ${prefix} \
EXTRA_OEMAKE = " "
do_configure() {
+ # Avoid problems with Qt 4.8.0 configure setting QMAKE_LINK from LD (since we want the linker to be g++)
+ unset LD
+
if [ ! -e mkspecs/${TARGET_OS}-oe-g++ ]; then
ln -sf linux-g++ mkspecs/${TARGET_OS}-oe-g++
fi
cp ../g++.conf mkspecs/common
cp ../linux.conf mkspecs/common
+ # don't use host g++ even during configure
+ sed -i -e "s#g++#${CXX}#" mkspecs/common/g++-base.conf
+ sed -i -e "s#gcc#${CC}#" mkspecs/common/g++-base.conf
# first launch configure to get qmake compiled for the nativesdk
(echo o; echo yes) | CC="${CC}" CXX="${CXX}" ./configure ${EXTRA_OECONF} || true
@@ -66,7 +71,6 @@ do_configure() {
if [ ! -e bin/qmake ]; then
ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake
fi
-
(echo o; echo yes) | CC="${CC}" CXX="${CXX}" ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
}
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb
index 4c90d57..ea5e13d 100644
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb
@@ -3,7 +3,8 @@ require qt4-tools-nativesdk.inc
PR = "${INC_PR}.0"
SRC_URI += "file://blacklist-diginotar-certs.diff \
- file://fix-qtbug-20925.patch"
+ file://fix-qtbug-20925.patch \
+ file://compile.test-lflags.patch "
SRC_URI[md5sum] = "9831cf1dfa8d0689a06c2c54c5c65aaf"
SRC_URI[sha256sum] = "97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 7+ messages in thread