* [CONSOLIDATED PULL 01/26] ncurses: libcurses.so should link to libncurses.so
2011-12-11 22:47 [CONSOLIDATED PULL 00/26] Round up of patches and pull Saul Wold
@ 2011-12-11 22:47 ` Saul Wold
2011-12-11 22:47 ` [CONSOLIDATED PULL 02/26] bitbake.conf: remove texinfo-native from ASSUME_PROVIDED Saul Wold
` (25 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2011-12-11 22:47 UTC (permalink / raw)
To: openembedded-core
The current libcurses (backward compat) links to libncurses.so.5.9,
this causes a problem since this library also needs libtinfo, the
libncurses.so, uses a "ld script" to include both, libcurses.so
should point to libncurses.so (the script) not the library.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-core/ncurses/ncurses.inc | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index df9252a..98f45a4 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc
SECTION = "libs"
DEPENDS = "ncurses-native"
DEPENDS_virtclass-native = ""
-INC_PR = "r2"
+INC_PR = "r3"
inherit autotools binconfig multilib_header
@@ -161,6 +161,9 @@ do_install() {
echo '/* GNU ld script */' >$f
echo "INPUT($i.so.5 AS_NEEDED(-ltinfo))" >>$f
done
+ # Make sure that libcurses is linked so that it gets -ltinfo
+ # also, this should be addressed upstream really.
+ ln -sf libncurses.so ${D}${libdir}/libcurses.so
# create libtermcap.so linker script for backward compatibility
f=${D}${libdir}/libtermcap.so
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 02/26] bitbake.conf: remove texinfo-native from ASSUME_PROVIDED
2011-12-11 22:47 [CONSOLIDATED PULL 00/26] Round up of patches and pull Saul Wold
2011-12-11 22:47 ` [CONSOLIDATED PULL 01/26] ncurses: libcurses.so should link to libncurses.so Saul Wold
@ 2011-12-11 22:47 ` Saul Wold
2011-12-11 22:47 ` [CONSOLIDATED PULL 03/26] texinfo: fix compile failure due target makedoc binary being used Saul Wold
` (24 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2011-12-11 22:47 UTC (permalink / raw)
To: openembedded-core
We need to build texinfo-native to get and install the makedoc tool
[YOCTO #1664]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/conf/bitbake.conf | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index eeb1fc4..f79e3f7 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -156,7 +156,6 @@ ASSUME_PROVIDED = "\
python-native-runtime \
subversion-native \
tar-native \
- texinfo-native \
virtual/libintl-native \
"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 03/26] texinfo: fix compile failure due target makedoc binary being used
2011-12-11 22:47 [CONSOLIDATED PULL 00/26] Round up of patches and pull Saul Wold
2011-12-11 22:47 ` [CONSOLIDATED PULL 01/26] ncurses: libcurses.so should link to libncurses.so Saul Wold
2011-12-11 22:47 ` [CONSOLIDATED PULL 02/26] bitbake.conf: remove texinfo-native from ASSUME_PROVIDED Saul Wold
@ 2011-12-11 22:47 ` Saul Wold
2011-12-11 22:47 ` [CONSOLIDATED PULL 04/26] task-self-hosted: Reorder by Alpha Saul Wold
` (23 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2011-12-11 22:47 UTC (permalink / raw)
To: openembedded-core
Need to have the texinfo-native build and install a host sysroot makedoc
binary and then patch the target build to use this binary. This requires
that we don't ASSUME_PROVIDED texinfo-native any longer since we need to
install this makedoc tool which is not part of the normal distrubtion.
[YOCTO #1664]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../texinfo/texinfo-4.13a/use_host_makedoc.patch | 37 ++++++++++++++++++++
meta/recipes-extended/texinfo/texinfo_4.13a.bb | 11 +++++-
2 files changed, 46 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-extended/texinfo/texinfo-4.13a/use_host_makedoc.patch
diff --git a/meta/recipes-extended/texinfo/texinfo-4.13a/use_host_makedoc.patch b/meta/recipes-extended/texinfo/texinfo-4.13a/use_host_makedoc.patch
new file mode 100644
index 0000000..db41f1a
--- /dev/null
+++ b/meta/recipes-extended/texinfo/texinfo-4.13a/use_host_makedoc.patch
@@ -0,0 +1,37 @@
+This patch requires that we also enable building of the
+texinfo-native recipe which will install the makedoc tool
+for the host machine.
+
+This patch simply uses the newly installed makedoc tool from
+sysroot.
+
+Upstream-Status: Inappropriate [OE-Specific]
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+Index: texinfo-4.13/info/Makefile.am
+===================================================================
+--- texinfo-4.13.orig/info/Makefile.am 2008-05-22 05:11:33.000000000 -0700
++++ texinfo-4.13/info/Makefile.am 2011-12-10 12:55:53.604440118 -0800
+@@ -75,7 +75,7 @@
+ # more than once.
+ funs.h: makedoc$(EXEEXT) $(cmd_sources)
+ rm -f $(generated_sources)
+- $(top_builddir)/$(native_tools)/info/makedoc $(cmd_sources)
++ makedoc $(cmd_sources)
+
+ # The following hack is necessary to hint make before the automatic
+ # dependencies are built.
+Index: texinfo-4.13/doc/Makefile.am
+===================================================================
+--- texinfo-4.13.orig/doc/Makefile.am 2008-09-18 11:31:56.000000000 -0700
++++ texinfo-4.13/doc/Makefile.am 2011-12-10 13:04:09.216457601 -0800
+@@ -19,7 +19,7 @@
+
+ # Use the programs built in our distribution, taking account of possible
+ # cross-compiling.
+-MAKEINFO = $(top_builddir)/$(native_tools)/makeinfo/makeinfo
++MAKEINFO = makeinfo
+
+ # We'd also like to use something like this, but Automake calls
+ # "install-info" directly.
diff --git a/meta/recipes-extended/texinfo/texinfo_4.13a.bb b/meta/recipes-extended/texinfo/texinfo_4.13a.bb
index 9f1c04a..f205d4e 100644
--- a/meta/recipes-extended/texinfo/texinfo_4.13a.bb
+++ b/meta/recipes-extended/texinfo/texinfo_4.13a.bb
@@ -6,11 +6,14 @@ HOMEPAGE = "http://www.gnu.org/software/texinfo/"
SECTION = "console/utils"
LICENSE = "GPLv3+"
LIC_FILES_CHKSUM = "file://COPYING;md5=adefda309052235aa5d1e99ce7557010"
-PR = "r1"
+PR = "r2"
DEPENDS = "zlib ncurses texinfo-native"
DEPENDS_virtclass-native = "zlib-native ncurses-native"
+TARGET_PATCH = "file://use_host_makedoc.patch"
+TARGET_PATCH_virtclass-native = ""
+
SRC_URI = "${GNU_MIRROR}/texinfo/texinfo-${PV}.tar.gz \
file://texinfo-4.12-zlib.patch \
file://texinfo-4.13a-data_types.patch \
@@ -19,7 +22,8 @@ SRC_URI = "${GNU_MIRROR}/texinfo/texinfo-${PV}.tar.gz \
file://texinfo-4.13a-help-index-segfault.patch \
file://disable-native-tools.patch \
file://link-zip.patch \
- file://gettext-macros.patch"
+ file://gettext-macros.patch \
+ ${TARGET_PATCH}"
SRC_URI[md5sum] = "71ba711519209b5fb583fed2b3d86fcb"
SRC_URI[sha256sum] = "1303e91a1c752b69a32666a407e9fbdd6e936def4b09bc7de30f416301530d68"
@@ -39,6 +43,9 @@ do_install_append() {
mkdir -p ${D}${datadir}/${tex_texinfo}
install -p -m644 doc/texinfo.tex doc/txi-??.tex ${D}${datadir}/${tex_texinfo}
}
+do_install_append_virtclass-native() {
+ install -m 755 info/makedoc ${D}${bindir}
+}
PACKAGES += "info info-doc"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 04/26] task-self-hosted: Reorder by Alpha
2011-12-11 22:47 [CONSOLIDATED PULL 00/26] Round up of patches and pull Saul Wold
` (2 preceding siblings ...)
2011-12-11 22:47 ` [CONSOLIDATED PULL 03/26] texinfo: fix compile failure due target makedoc binary being used Saul Wold
@ 2011-12-11 22:47 ` Saul Wold
2011-12-11 22:47 ` [CONSOLIDATED PULL 05/26] task-self-hosted: Added perl-pod (slight reorder) Saul Wold
` (22 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2011-12-11 22:47 UTC (permalink / raw)
To: openembedded-core
No additions/subtractions
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-core/tasks/task-self-hosted.bb | 38 +++++++++++++-------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/meta/recipes-core/tasks/task-self-hosted.bb b/meta/recipes-core/tasks/task-self-hosted.bb
index b3a68b4..e359b3d 100644
--- a/meta/recipes-core/tasks/task-self-hosted.bb
+++ b/meta/recipes-core/tasks/task-self-hosted.bb
@@ -3,7 +3,7 @@
#
DESCRIPTION = "Create Basic Image Tasks"
-PR = "r1"
+PR = "r2"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
@@ -27,9 +27,6 @@ RDEPENDS_task-self-hosted = "\
# eglibc-utils: for rpcgen
RDEPENDS_task-self-hosted-sdk = "\
- sed \
- mktemp \
- eglibc-utils \
autoconf \
automake \
binutils-symlinks \
@@ -37,27 +34,30 @@ RDEPENDS_task-self-hosted-sdk = "\
cpp \
cpp-symlinks \
ccache \
+ coreutils \
+ diffutils \
+ distcc \
+ eglibc-utils \
+ file \
+ findutils \
gcc \
gcc-symlinks \
g++ \
g++-symlinks \
gettext \
- make \
intltool \
+ ldd \
+ less \
libstdc++ \
libstdc++-dev \
libtool \
+ make \
+ mktemp \
perl-module-re \
perl-module-text-wrap \
- coreutils \
- diffutils \
pkgconfig \
- findutils \
quilt \
- less \
- distcc \
- ldd \
- file \
+ sed \
tcl \
"
@@ -74,6 +74,7 @@ RDEPENDS_task-self-hosted-extended = "\
bzip2 \
chkconfig \
chrpath \
+ cpio \
curl \
dhcp-client \
diffstat \
@@ -89,6 +90,12 @@ RDEPENDS_task-self-hosted-extended = "\
groff \
gawk \
hdparm \
+ iptables \
+ kernel-module-tun \
+ kernel-module-iptable-raw \
+ kernel-module-iptable-nat \
+ kernel-module-iptable-mangle \
+ kernel-module-iptable-filter \
libaio \
libxml2 \
libusb1 \
@@ -158,13 +165,6 @@ RDEPENDS_task-self-hosted-extended = "\
xinetd \
zip \
zlib \
- cpio \
- iptables \
- kernel-module-tun \
- kernel-module-iptable-raw \
- kernel-module-iptable-nat \
- kernel-module-iptable-mangle \
- kernel-module-iptable-filter \
"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 05/26] task-self-hosted: Added perl-pod (slight reorder)
2011-12-11 22:47 [CONSOLIDATED PULL 00/26] Round up of patches and pull Saul Wold
` (3 preceding siblings ...)
2011-12-11 22:47 ` [CONSOLIDATED PULL 04/26] task-self-hosted: Reorder by Alpha Saul Wold
@ 2011-12-11 22:47 ` Saul Wold
2011-12-11 22:47 ` [CONSOLIDATED PULL 06/26] task-self-hosted: Add host-tools task Saul Wold
` (21 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2011-12-11 22:47 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-core/tasks/task-self-hosted.bb | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/tasks/task-self-hosted.bb b/meta/recipes-core/tasks/task-self-hosted.bb
index e359b3d..4288499 100644
--- a/meta/recipes-core/tasks/task-self-hosted.bb
+++ b/meta/recipes-core/tasks/task-self-hosted.bb
@@ -116,8 +116,9 @@ RDEPENDS_task-self-hosted-extended = "\
parted \
patch \
perl \
- perl-modules \
perl-dev \
+ perl-modules \
+ perl-pod \
pth \
python \
python-compile \
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 06/26] task-self-hosted: Add host-tools task
2011-12-11 22:47 [CONSOLIDATED PULL 00/26] Round up of patches and pull Saul Wold
` (4 preceding siblings ...)
2011-12-11 22:47 ` [CONSOLIDATED PULL 05/26] task-self-hosted: Added perl-pod (slight reorder) Saul Wold
@ 2011-12-11 22:47 ` Saul Wold
2011-12-11 22:47 ` [CONSOLIDATED PULL 07/26] task-self-hosted: Move tools to " Saul Wold
` (20 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2011-12-11 22:47 UTC (permalink / raw)
To: openembedded-core
Added tools to create and manage ext* partitions
e2fs*, parted
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-core/tasks/task-self-hosted.bb | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-core/tasks/task-self-hosted.bb b/meta/recipes-core/tasks/task-self-hosted.bb
index 4288499..69b9276 100644
--- a/meta/recipes-core/tasks/task-self-hosted.bb
+++ b/meta/recipes-core/tasks/task-self-hosted.bb
@@ -14,6 +14,7 @@ PACKAGES = "\
task-self-hosted-sdk \
task-self-hosted-extended \
task-self-hosted-graphics \
+ task-self-hosted-host-tools \
"
ALLOW_EMPTY = "1"
@@ -23,6 +24,17 @@ RDEPENDS_task-self-hosted = "\
task-self-hosted-sdk \
task-self-hosted-extended \
task-self-hosted-graphics \
+ task-self-hosted-host-tools \
+ "
+
+RDEPENDS_task-self-hosted-host-tools = "\
+ e2fsprogs \
+ e2fsprogs-e2fsck \
+ e2fsprogs-fsck \
+ e2fsprogs-mke2fs \
+ e2fsprogs-tune2fs \
+ genext2fs \
+ parted \
"
# eglibc-utils: for rpcgen
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 07/26] task-self-hosted: Move tools to host-tools task
2011-12-11 22:47 [CONSOLIDATED PULL 00/26] Round up of patches and pull Saul Wold
` (5 preceding siblings ...)
2011-12-11 22:47 ` [CONSOLIDATED PULL 06/26] task-self-hosted: Add host-tools task Saul Wold
@ 2011-12-11 22:47 ` Saul Wold
2011-12-11 22:47 ` [CONSOLIDATED PULL 08/26] lzop-1.03: add recipe Saul Wold
` (19 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2011-12-11 22:47 UTC (permalink / raw)
To: openembedded-core
Moved kernel modules for iptable and tun, along with
dhcp-client iptables, mc, screen to host-tools as they
are not sdk.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-core/tasks/task-self-hosted.bb | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/meta/recipes-core/tasks/task-self-hosted.bb b/meta/recipes-core/tasks/task-self-hosted.bb
index 69b9276..077193b 100644
--- a/meta/recipes-core/tasks/task-self-hosted.bb
+++ b/meta/recipes-core/tasks/task-self-hosted.bb
@@ -28,13 +28,23 @@ RDEPENDS_task-self-hosted = "\
"
RDEPENDS_task-self-hosted-host-tools = "\
+ dhcp-client \
e2fsprogs \
e2fsprogs-e2fsck \
e2fsprogs-fsck \
e2fsprogs-mke2fs \
e2fsprogs-tune2fs \
genext2fs \
+ hdparm \
+ iptables \
+ kernel-module-tun \
+ kernel-module-iptable-raw \
+ kernel-module-iptable-nat \
+ kernel-module-iptable-mangle \
+ kernel-module-iptable-filter \
+ mc \
parted \
+ screen \
"
# eglibc-utils: for rpcgen
@@ -88,7 +98,6 @@ RDEPENDS_task-self-hosted-extended = "\
chrpath \
cpio \
curl \
- dhcp-client \
diffstat \
diffutils \
elfutils \
@@ -101,13 +110,6 @@ RDEPENDS_task-self-hosted-extended = "\
grep \
groff \
gawk \
- hdparm \
- iptables \
- kernel-module-tun \
- kernel-module-iptable-raw \
- kernel-module-iptable-nat \
- kernel-module-iptable-mangle \
- kernel-module-iptable-filter \
libaio \
libxml2 \
libusb1 \
@@ -116,7 +118,6 @@ RDEPENDS_task-self-hosted-extended = "\
lzo \
man \
man-pages \
- mc \
mdadm \
minicom \
mtools \
@@ -160,7 +161,6 @@ RDEPENDS_task-self-hosted-extended = "\
quota \
readline \
rpm \
- screen \
setserial \
subversion \
sudo \
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 08/26] lzop-1.03: add recipe
2011-12-11 22:47 [CONSOLIDATED PULL 00/26] Round up of patches and pull Saul Wold
` (6 preceding siblings ...)
2011-12-11 22:47 ` [CONSOLIDATED PULL 07/26] task-self-hosted: Move tools to " Saul Wold
@ 2011-12-11 22:47 ` Saul Wold
2011-12-11 22:47 ` [CONSOLIDATED PULL 09/26] dosfstools: update native to 2.11 Saul Wold
` (18 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2011-12-11 22:47 UTC (permalink / raw)
To: openembedded-core
From: Christopher Larson <chris_larson@mentor.com>
This is needed by some kernels when CONFIG_KERNEL_LZO=y (specifically, given
the current defconfig, this affects linux-omap4 2.6 in the meta-ti layer).
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
meta/recipes-support/lzop/lzop/acinclude.m4 | 390 +++++++++++++++++++++++++++
meta/recipes-support/lzop/lzop_1.03.bb | 27 ++
2 files changed, 417 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-support/lzop/lzop/acinclude.m4
create mode 100644 meta/recipes-support/lzop/lzop_1.03.bb
diff --git a/meta/recipes-support/lzop/lzop/acinclude.m4 b/meta/recipes-support/lzop/lzop/acinclude.m4
new file mode 100644
index 0000000..0029c19
--- /dev/null
+++ b/meta/recipes-support/lzop/lzop/acinclude.m4
@@ -0,0 +1,390 @@
+
+AC_DEFUN([mfx_ACC_CHECK_ENDIAN], [
+AC_C_BIGENDIAN([AC_DEFINE(ACC_ABI_BIG_ENDIAN,1,[Define to 1 if your machine is big endian.])],[AC_DEFINE(ACC_ABI_LITTLE_ENDIAN,1,[Define to 1 if your machine is little endian.])])
+])#
+
+AC_DEFUN([mfx_ACC_CHECK_HEADERS], [
+AC_HEADER_TIME
+AC_CHECK_HEADERS([assert.h ctype.h dirent.h errno.h fcntl.h float.h limits.h malloc.h memory.h setjmp.h signal.h stdarg.h stddef.h stdint.h stdio.h stdlib.h string.h strings.h time.h unistd.h utime.h sys/stat.h sys/time.h sys/types.h sys/wait.h])
+])#
+
+AC_DEFUN([mfx_ACC_CHECK_FUNCS], [
+AC_CHECK_FUNCS(access alloca atexit atoi atol chmod chown ctime difftime fstat gettimeofday gmtime localtime longjmp lstat memcmp memcpy memmove memset mktime qsort raise setjmp signal snprintf strcasecmp strchr strdup strerror strftime stricmp strncasecmp strnicmp strrchr strstr time umask utime vsnprintf)
+])#
+
+
+AC_DEFUN([mfx_ACC_CHECK_SIZEOF], [
+AC_CHECK_SIZEOF(short)
+AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(long)
+
+AC_CHECK_SIZEOF(long long)
+AC_CHECK_SIZEOF(__int16)
+AC_CHECK_SIZEOF(__int32)
+AC_CHECK_SIZEOF(__int64)
+
+AC_CHECK_SIZEOF(void *)
+AC_CHECK_SIZEOF(size_t)
+AC_CHECK_SIZEOF(ptrdiff_t)
+])#
+
+
+# /***********************************************************************
+# // Check for ACC_conformance
+# ************************************************************************/
+
+AC_DEFUN([mfx_ACC_ACCCHK], [
+mfx_tmp=$1
+mfx_save_CPPFLAGS=$CPPFLAGS
+dnl in Makefile.in $(INCLUDES) will be before $(CPPFLAGS), so we mimic this here
+test "X$mfx_tmp" = "X" || CPPFLAGS="$mfx_tmp $CPPFLAGS"
+
+AC_MSG_CHECKING([whether your compiler passes the ACC conformance test])
+
+AC_LANG_CONFTEST([AC_LANG_PROGRAM(
+[[#define ACC_CONFIG_NO_HEADER 1
+#include "acc/acc.h"
+#include "acc/acc_incd.h"
+#undef ACCCHK_ASSERT
+#define ACCCHK_ASSERT(expr) ACC_COMPILE_TIME_ASSERT_HEADER(expr)
+#include "acc/acc_chk.ch"
+#undef ACCCHK_ASSERT
+static void test_acc_compile_time_assert(void) {
+#define ACCCHK_ASSERT(expr) ACC_COMPILE_TIME_ASSERT(expr)
+#include "acc/acc_chk.ch"
+#undef ACCCHK_ASSERT
+}
+#undef NDEBUG
+#include <assert.h>
+static int test_acc_run_time_assert(int r) {
+#define ACCCHK_ASSERT(expr) assert(expr);
+#include "acc/acc_chk.ch"
+#undef ACCCHK_ASSERT
+return r;
+}
+]], [[
+test_acc_compile_time_assert();
+if (test_acc_run_time_assert(1) != 1) return 1;
+]]
+)])
+
+mfx_tmp=FAILED
+_AC_COMPILE_IFELSE([], [mfx_tmp=yes])
+rm -f conftest.$ac_ext conftest.$ac_objext
+
+CPPFLAGS=$mfx_save_CPPFLAGS
+
+AC_MSG_RESULT([$mfx_tmp])
+case x$mfx_tmp in
+ xpassed | xyes) ;;
+ *)
+ AC_MSG_NOTICE([])
+ AC_MSG_NOTICE([Your compiler failed the ACC conformance test - for details see ])
+ AC_MSG_NOTICE([`config.log'. Please check that log file and consider sending])
+ AC_MSG_NOTICE([a patch or bug-report to <${PACKAGE_BUGREPORT}>.])
+ AC_MSG_NOTICE([Thanks for your support.])
+ AC_MSG_NOTICE([])
+ AC_MSG_ERROR([ACC conformance test failed. Stop.])
+dnl AS_EXIT
+ ;;
+esac
+])# mfx_ACC_ACCCHK
+
+
+# /***********************************************************************
+# // Check for ACC_conformance
+# ************************************************************************/
+
+AC_DEFUN([mfx_MINIACC_ACCCHK], [
+mfx_tmp=$1
+mfx_save_CPPFLAGS=$CPPFLAGS
+dnl in Makefile.in $(INCLUDES) will be before $(CPPFLAGS), so we mimic this here
+test "X$mfx_tmp" = "X" || CPPFLAGS="$mfx_tmp $CPPFLAGS"
+
+AC_MSG_CHECKING([whether your compiler passes the ACC conformance test])
+
+AC_LANG_CONFTEST([AC_LANG_PROGRAM(
+[[#define ACC_CONFIG_NO_HEADER 1
+#define ACC_WANT_ACC_INCD_H 1
+#include $2
+
+#define ACC_WANT_ACC_CHK_CH 1
+#undef ACCCHK_ASSERT
+#define ACCCHK_ASSERT(expr) ACC_COMPILE_TIME_ASSERT_HEADER(expr)
+#include $2
+
+#define ACC_WANT_ACC_CHK_CH 1
+#undef ACCCHK_ASSERT
+#define ACCCHK_ASSERT(expr) ACC_COMPILE_TIME_ASSERT(expr)
+static void test_acc_compile_time_assert(void) {
+#include $2
+}
+
+#undef NDEBUG
+#include <assert.h>
+#define ACC_WANT_ACC_CHK_CH 1
+#undef ACCCHK_ASSERT
+#define ACCCHK_ASSERT(expr) assert(expr);
+static int test_acc_run_time_assert(int r) {
+#include $2
+return r;
+}
+]], [[
+test_acc_compile_time_assert();
+if (test_acc_run_time_assert(1) != 1) return 1;
+]]
+)])
+
+mfx_tmp=FAILED
+_AC_COMPILE_IFELSE([], [mfx_tmp=yes])
+rm -f conftest.$ac_ext conftest.$ac_objext
+
+CPPFLAGS=$mfx_save_CPPFLAGS
+
+AC_MSG_RESULT([$mfx_tmp])
+case x$mfx_tmp in
+ xpassed | xyes) ;;
+ *)
+ AC_MSG_NOTICE([])
+ AC_MSG_NOTICE([Your compiler failed the ACC conformance test - for details see ])
+ AC_MSG_NOTICE([`config.log'. Please check that log file and consider sending])
+ AC_MSG_NOTICE([a patch or bug-report to <${PACKAGE_BUGREPORT}>.])
+ AC_MSG_NOTICE([Thanks for your support.])
+ AC_MSG_NOTICE([])
+ AC_MSG_ERROR([ACC conformance test failed. Stop.])
+dnl AS_EXIT
+ ;;
+esac
+])# mfx_MINIACC_ACCCHK
+
+
+
+# serial 1
+
+AC_DEFUN([mfx_PROG_CPPFLAGS], [
+AC_MSG_CHECKING([whether the C preprocessor needs special flags])
+
+AC_LANG_CONFTEST([AC_LANG_PROGRAM(
+[[#include <limits.h>
+#if (32767 >= 4294967295ul) || (65535u >= 4294967295ul)
+# include "your C preprocessor is broken 1"
+#elif (0xffffu == 0xfffffffful)
+# include "your C preprocessor is broken 2"
+#elif (32767 >= ULONG_MAX) || (65535u >= ULONG_MAX)
+# include "your C preprocessor is broken 3"
+#endif
+]], [[ ]]
+)])
+
+mfx_save_CPPFLAGS=$CPPFLAGS
+mfx_tmp=ERROR
+for mfx_arg in "" -no-cpp-precomp
+do
+ CPPFLAGS="$mfx_arg $mfx_save_CPPFLAGS"
+ _AC_COMPILE_IFELSE([],
+[mfx_tmp=$mfx_arg
+break])
+done
+CPPFLAGS=$mfx_save_CPPFLAGS
+rm -f conftest.$ac_ext conftest.$ac_objext
+case x$mfx_tmp in
+ x)
+ AC_MSG_RESULT([none needed]) ;;
+ xERROR)
+ AC_MSG_RESULT([ERROR])
+ AC_MSG_ERROR([your C preprocessor is broken - for details see config.log])
+ ;;
+ *)
+ AC_MSG_RESULT([$mfx_tmp])
+ CPPFLAGS="$mfx_tmp $CPPFLAGS"
+ ;;
+esac
+])# mfx_PROG_CPPFLAGS
+
+
+
+# serial 3
+
+AC_DEFUN([mfx_CHECK_HEADER_SANE_LIMITS_H], [
+AC_CACHE_CHECK([whether limits.h is sane],
+mfx_cv_header_sane_limits_h,
+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <limits.h>
+#if (32767 >= 4294967295ul) || (65535u >= 4294967295ul)
+# if defined(__APPLE__) && defined(__GNUC__)
+# error "your preprocessor is broken - use compiler option -no-cpp-precomp"
+# else
+# include "your preprocessor is broken"
+# endif
+#endif
+#define MFX_0xffff 0xffff
+#define MFX_0xffffffffL 4294967295ul
+#if !defined(CHAR_BIT) || (CHAR_BIT != 8)
+# include "error CHAR_BIT"
+#endif
+#if !defined(UCHAR_MAX)
+# include "error UCHAR_MAX 1"
+#endif
+#if !defined(USHRT_MAX)
+# include "error USHRT_MAX 1"
+#endif
+#if !defined(UINT_MAX)
+# include "error UINT_MAX 1"
+#endif
+#if !defined(ULONG_MAX)
+# include "error ULONG_MAX 1"
+#endif
+#if !defined(SHRT_MAX)
+# include "error SHRT_MAX 1"
+#endif
+#if !defined(INT_MAX)
+# include "error INT_MAX 1"
+#endif
+#if !defined(LONG_MAX)
+# include "error LONG_MAX 1"
+#endif
+#if (UCHAR_MAX < 1)
+# include "error UCHAR_MAX 2"
+#endif
+#if (USHRT_MAX < 1)
+# include "error USHRT_MAX 2"
+#endif
+#if (UINT_MAX < 1)
+# include "error UINT_MAX 2"
+#endif
+#if (ULONG_MAX < 1)
+# include "error ULONG_MAX 2"
+#endif
+#if (UCHAR_MAX < 0xff)
+# include "error UCHAR_MAX 3"
+#endif
+#if (USHRT_MAX < MFX_0xffff)
+# include "error USHRT_MAX 3"
+#endif
+#if (UINT_MAX < MFX_0xffff)
+# include "error UINT_MAX 3"
+#endif
+#if (ULONG_MAX < MFX_0xffffffffL)
+# include "error ULONG_MAX 3"
+#endif
+#if (USHRT_MAX > UINT_MAX)
+# include "error USHRT_MAX vs UINT_MAX"
+#endif
+#if (UINT_MAX > ULONG_MAX)
+# include "error UINT_MAX vs ULONG_MAX"
+#endif
+]], [[
+#if (USHRT_MAX == MFX_0xffff)
+{ typedef char a_short2a[1 - 2 * !(sizeof(short) == 2)]; }
+#elif (USHRT_MAX >= MFX_0xffff)
+{ typedef char a_short2b[1 - 2 * !(sizeof(short) > 2)]; }
+#endif
+#if (UINT_MAX == MFX_0xffff)
+{ typedef char a_int2a[1 - 2 * !(sizeof(int) == 2)]; }
+#elif (UINT_MAX >= MFX_0xffff)
+{ typedef char a_int2b[1 - 2 * !(sizeof(int) > 2)]; }
+#endif
+#if (ULONG_MAX == MFX_0xffff)
+{ typedef char a_long2a[1 - 2 * !(sizeof(long) == 2)]; }
+#elif (ULONG_MAX >= MFX_0xffff)
+{ typedef char a_long2b[1 - 2 * !(sizeof(long) > 2)]; }
+#endif
+#if (USHRT_MAX == MFX_0xffffffffL)
+{ typedef char a_short4a[1 - 2 * !(sizeof(short) == 4)]; }
+#elif (USHRT_MAX >= MFX_0xffffffffL)
+{ typedef char a_short4b[1 - 2 * !(sizeof(short) > 4)]; }
+#endif
+#if (UINT_MAX == MFX_0xffffffffL)
+{ typedef char a_int4a[1 - 2 * !(sizeof(int) == 4)]; }
+#elif (UINT_MAX >= MFX_0xffffffffL)
+{ typedef char a_int4b[1 - 2 * !(sizeof(int) > 4)]; }
+#endif
+#if (ULONG_MAX == MFX_0xffffffffL)
+{ typedef char a_long4a[1 - 2 * !(sizeof(long) == 4)]; }
+#elif (ULONG_MAX >= MFX_0xffffffffL)
+{ typedef char a_long4b[1 - 2 * !(sizeof(long) > 4)]; }
+#endif
+]])],
+[mfx_cv_header_sane_limits_h=yes],
+[mfx_cv_header_sane_limits_h=no])])
+])
+
+# /***********************************************************************
+# // standard
+# ************************************************************************/
+
+AC_DEFUN([mfx_LZO_CHECK_ENDIAN], [
+AC_C_BIGENDIAN([AC_DEFINE(LZO_ABI_BIG_ENDIAN,1,[Define to 1 if your machine is big endian.])],[AC_DEFINE(LZO_ABI_LITTLE_ENDIAN,1,[Define to 1 if your machine is little endian.])])
+])#
+
+
+# /***********************************************************************
+# //
+# ************************************************************************/
+
+dnl more types which are not yet covered by ACC
+
+AC_DEFUN([mfx_CHECK_SIZEOF], [
+AC_CHECK_SIZEOF(__int32)
+AC_CHECK_SIZEOF(intmax_t)
+AC_CHECK_SIZEOF(uintmax_t)
+AC_CHECK_SIZEOF(intptr_t)
+AC_CHECK_SIZEOF(uintptr_t)
+
+AC_CHECK_SIZEOF(float)
+AC_CHECK_SIZEOF(double)
+AC_CHECK_SIZEOF(long double)
+
+AC_CHECK_SIZEOF(dev_t)
+AC_CHECK_SIZEOF(fpos_t)
+AC_CHECK_SIZEOF(mode_t)
+AC_CHECK_SIZEOF(off_t)
+AC_CHECK_SIZEOF(ssize_t)
+AC_CHECK_SIZEOF(time_t)
+])#
+
+
+
+AC_DEFUN([mfx_CHECK_LIB_WINMM], [
+if test "X$GCC" = Xyes; then
+case $host_os in
+cygwin* | mingw* | pw32*)
+ test "X$LIBS" != "X" && LIBS="$LIBS "
+ LIBS="${LIBS}-lwinmm" ;;
+*)
+ ;;
+esac
+fi
+])#
+
+#serial 6
+
+dnl From Paul Eggert.
+
+# Define ST_MTIM_NSEC to be the nanoseconds member of struct stat's st_mtim,
+# if it exists.
+
+AC_DEFUN([AC_STRUCT_ST_MTIM_NSEC],
+ [AC_CACHE_CHECK([for nanoseconds member of struct stat.st_mtim],
+ ac_cv_struct_st_mtim_nsec,
+ [ac_save_CPPFLAGS="$CPPFLAGS"
+ ac_cv_struct_st_mtim_nsec=no
+ # tv_nsec -- the usual case
+ # _tv_nsec -- Solaris 2.6, if
+ # (defined _XOPEN_SOURCE && _XOPEN_SOURCE_EXTENDED == 1
+ # && !defined __EXTENSIONS__)
+ # st__tim.tv_nsec -- UnixWare 2.1.2
+ for ac_val in tv_nsec _tv_nsec st__tim.tv_nsec; do
+ CPPFLAGS="$ac_save_CPPFLAGS -DST_MTIM_NSEC=$ac_val"
+ AC_TRY_COMPILE([#include <sys/types.h>
+#include <sys/stat.h>], [struct stat s; s.st_mtim.ST_MTIM_NSEC;],
+ [ac_cv_struct_st_mtim_nsec=$ac_val; break])
+ done
+ CPPFLAGS="$ac_save_CPPFLAGS"])
+
+ if test $ac_cv_struct_st_mtim_nsec != no; then
+ AC_DEFINE_UNQUOTED(ST_MTIM_NSEC, $ac_cv_struct_st_mtim_nsec,
+ [Define to be the nanoseconds member of struct stat's st_mtim,
+ if it exists.])
+ fi
+ ]
+)
diff --git a/meta/recipes-support/lzop/lzop_1.03.bb b/meta/recipes-support/lzop/lzop_1.03.bb
new file mode 100644
index 0000000..63a2a62
--- /dev/null
+++ b/meta/recipes-support/lzop/lzop_1.03.bb
@@ -0,0 +1,27 @@
+SUMMARY = "Real-time file compressor"
+DESCRIPTION = "lzop is a compression utility which is designed to be a companion to gzip. \n\
+It is based on the LZO data compression library and its main advantages over \n\
+gzip are much higher compression and decompression speed at the cost of some \n\
+compression ratio. The lzop compression utility was designed with the goals \n\
+of reliability, speed, portability and with reasonable drop-in compatibility \n\
+to gzip."
+DEPENDS += "lzo"
+PR = "r0"
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=dfeaf3dc4beef4f5a7bdbc35b197f39e \
+ file://src/lzop.c;beginline=5;endline=21;md5=6797bd3ed0a1a49327b7ebf9366ebd86"
+
+SRC_URI = "http://www.lzop.org/download/${BP}.tar.gz \
+ file://acinclude.m4"
+SRC_URI[md5sum] = "006c5e27fb78cdd14a628fdfa5aa1905"
+SRC_URI[sha256sum] = "c1425b8c77d49f5a679d5a126c90ea6ad99585a55e335a613cae59e909dbb2c9"
+
+inherit autotools
+
+do_configure () {
+ ln -sf ../acinclude.m4
+ autotools_do_configure
+}
+
+BBCLASSEXTEND += "native nativesdk"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 09/26] dosfstools: update native to 2.11
2011-12-11 22:47 [CONSOLIDATED PULL 00/26] Round up of patches and pull Saul Wold
` (7 preceding siblings ...)
2011-12-11 22:47 ` [CONSOLIDATED PULL 08/26] lzop-1.03: add recipe Saul Wold
@ 2011-12-11 22:47 ` Saul Wold
2011-12-11 22:47 ` [CONSOLIDATED PULL 10/26] u-boot: renamed dir from uboot to the more appropriate u-boot Saul Wold
` (17 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2011-12-11 22:47 UTC (permalink / raw)
To: openembedded-core
From: Otavio Salvador <otavio@ossystems.com.br>
This unify recipes for target and native builds and also drops the the
already merged patches.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
.../dosfstools/dosfstools-native_2.10.bb | 19 -----
.../dosfstools/dosfstools/2.6.20-syscall.patch | 72 -------------------
.../dosfstools/dosfstools-2.10-kernel-2.6.patch | 74 --------------------
.../dosfstools/dosfstools/mkdosfs-bootcode.patch | 68 ++++++++----------
.../dosfstools/dosfstools/mkdosfs-dir.patch | 62 ++++++++---------
.../recipes-devtools/dosfstools/dosfstools_2.10.bb | 24 ------
.../recipes-devtools/dosfstools/dosfstools_2.11.bb | 11 ++-
7 files changed, 69 insertions(+), 261 deletions(-)
delete mode 100644 meta/recipes-devtools/dosfstools/dosfstools-native_2.10.bb
delete mode 100644 meta/recipes-devtools/dosfstools/dosfstools/2.6.20-syscall.patch
delete mode 100644 meta/recipes-devtools/dosfstools/dosfstools/dosfstools-2.10-kernel-2.6.patch
delete mode 100644 meta/recipes-devtools/dosfstools/dosfstools_2.10.bb
diff --git a/meta/recipes-devtools/dosfstools/dosfstools-native_2.10.bb b/meta/recipes-devtools/dosfstools/dosfstools-native_2.10.bb
deleted file mode 100644
index 91ff11f..0000000
--- a/meta/recipes-devtools/dosfstools/dosfstools-native_2.10.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-# dosfstools-native OE build file
-# Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-require dosfstools_${PV}.bb
-
-PR="r5"
-
-SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}.src.tar.gz \
- file://mkdosfs-bootcode.patch \
- file://mkdosfs-dir.patch \
- file://alignment_hack.patch \
- file://dosfstools-2.10-kernel-2.6.patch \
- file://msdos_fat12_undefined.patch \
- file://dosfstools-msdos_fs-types.patch \
- file://include-linux-types.patch \
- file://2.6.20-syscall.patch"
-
-inherit native
diff --git a/meta/recipes-devtools/dosfstools/dosfstools/2.6.20-syscall.patch b/meta/recipes-devtools/dosfstools/dosfstools/2.6.20-syscall.patch
deleted file mode 100644
index 4460f06..0000000
--- a/meta/recipes-devtools/dosfstools/dosfstools/2.6.20-syscall.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Only use the system's llseek().
-
-Upstream-Status: Inappropriate [licensing]
-We're tracking an old release of dosfstools due to licensing issues.
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
-Index: dosfstools-2.10/dosfsck/io.c
-===================================================================
---- dosfstools-2.10.orig/dosfsck/io.c 2007-06-07 16:15:52.000000000 +0200
-+++ dosfstools-2.10/dosfsck/io.c 2007-06-07 16:16:06.000000000 +0200
-@@ -42,28 +42,11 @@
- /* Use the _llseek system call directly, because there (once?) was a bug in
- * the glibc implementation of it. */
- #include <linux/unistd.h>
--#if defined __alpha || defined __ia64__ || defined __s390x__ || defined __x86_64__ || defined __ppc64__
- /* On alpha, the syscall is simply lseek, because it's a 64 bit system. */
- static loff_t llseek( int fd, loff_t offset, int whence )
- {
- return lseek(fd, offset, whence);
- }
--#else
--# ifndef __NR__llseek
--# error _llseek system call not present
--# endif
--static _syscall5( int, _llseek, uint, fd, ulong, hi, ulong, lo,
-- loff_t *, res, uint, wh );
--
--static loff_t llseek( int fd, loff_t offset, int whence )
--{
-- loff_t actual;
--
-- if (_llseek(fd, offset>>32, offset&0xffffffff, &actual, whence) != 0)
-- return (loff_t)-1;
-- return actual;
--}
--#endif
-
-
- void fs_open(char *path,int rw)
-Index: dosfstools-2.10/mkdosfs/mkdosfs.c
-===================================================================
---- dosfstools-2.10.orig/mkdosfs/mkdosfs.c 2007-06-07 16:15:11.000000000 +0200
-+++ dosfstools-2.10/mkdosfs/mkdosfs.c 2007-06-07 16:15:30.000000000 +0200
-@@ -116,27 +116,11 @@
- /* Use the _llseek system call directly, because there (once?) was a bug in
- * the glibc implementation of it. */
- #include <linux/unistd.h>
--#if defined __alpha || defined __ia64__ || defined __s390x__ || defined __x86_64__ || defined __ppc64__
- /* On alpha, the syscall is simply lseek, because it's a 64 bit system. */
- static loff_t llseek( int fd, loff_t offset, int whence )
- {
- return lseek(fd, offset, whence);
- }
--#else
--# ifndef __NR__llseek
--# error _llseek system call not present
--# endif
--static _syscall5( int, _llseek, uint, fd, ulong, hi, ulong, lo,
-- loff_t *, res, uint, wh );
--static loff_t llseek( int fd, loff_t offset, int whence )
--{
-- loff_t actual;
--
-- if (_llseek(fd, offset>>32, offset&0xffffffff, &actual, whence) != 0)
-- return (loff_t)-1;
-- return actual;
--}
--#endif
-
- #define ROUND_UP(value, divisor) (value + (divisor - (value % divisor))) / divisor
-
diff --git a/meta/recipes-devtools/dosfstools/dosfstools/dosfstools-2.10-kernel-2.6.patch b/meta/recipes-devtools/dosfstools/dosfstools/dosfstools-2.10-kernel-2.6.patch
deleted file mode 100644
index 0c9230f..0000000
--- a/meta/recipes-devtools/dosfstools/dosfstools/dosfstools-2.10-kernel-2.6.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
-Date: 2004-02-09
-Initial Package Version: 2.6
-Origin: Jim Gifford
-Upstream-Status: Accepted
-Description: Fixes Compile Issues with the 2.6 Kernel
-
---- dosfstools-2.10/dosfsck/common.h.orig 2004-02-09 18:37:59.056737458 +0000
-+++ dosfstools-2.10/dosfsck/common.h 2004-02-09 18:38:18.333392952 +0000
-@@ -2,6 +2,13 @@
-
- /* Written 1993 by Werner Almesberger */
-
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-+ #define __KERNEL__
-+ #include <asm/types.h>
-+ #undef __KERNEL__
-+ #define MSDOS_FAT12 4084 /* maximum number of clusters in a 12 bit FAT */
-+#endif
-
- #ifndef _COMMON_H
- #define _COMMON_H
---- dosfstools-2.10/dosfsck/file.c.orig 2004-02-09 18:40:52.016728845 +0000
-+++ dosfstools-2.10/dosfsck/file.c 2004-02-09 18:40:03.665117865 +0000
-@@ -15,6 +15,14 @@
- #define _LINUX_STAT_H /* hack to avoid inclusion of <linux/stat.h> */
- #define _LINUX_STRING_H_ /* hack to avoid inclusion of <linux/string.h>*/
- #define _LINUX_FS_H /* hack to avoid inclusion of <linux/fs.h> */
-+
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-+ #define __KERNEL__
-+ #include <asm/types.h>
-+ #undef __KERNEL__
-+#endif
-+
- #include <linux/msdos_fs.h>
-
- #include "common.h"
---- dosfstools-2.10/dosfsck/dosfsck.h.orig 2004-02-09 18:57:11.022870974 +0000
-+++ dosfstools-2.10/dosfsck/dosfsck.h 2004-02-09 18:56:20.628614393 +0000
-@@ -13,6 +13,15 @@
- #define _LINUX_STAT_H /* hack to avoid inclusion of <linux/stat.h> */
- #define _LINUX_STRING_H_ /* hack to avoid inclusion of <linux/string.h>*/
- #define _LINUX_FS_H /* hack to avoid inclusion of <linux/fs.h> */
-+
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-+ #define __KERNEL__
-+ #include <asm/types.h>
-+ #include <asm/byteorder.h>
-+ #undef __KERNEL__
-+#endif
-+
- #include <linux/msdos_fs.h>
-
- /* 2.1 kernels use le16_to_cpu() type functions for CF_LE_W & Co., but don't
---- dosfstools-2.10/mkdosfs/mkdosfs.c.orig 2004-02-09 18:31:41.997157413 +0000
-+++ dosfstools-2.10/mkdosfs/mkdosfs.c 2004-02-09 18:34:07.311945252 +0000
-@@ -66,6 +66,13 @@
- #include <time.h>
- #include <errno.h>
-
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-+ #define __KERNEL__
-+ #include <asm/types.h>
-+ #undef __KERNEL__
-+#endif
-+
- #if __BYTE_ORDER == __BIG_ENDIAN
-
- #include <asm/byteorder.h>
diff --git a/meta/recipes-devtools/dosfstools/dosfstools/mkdosfs-bootcode.patch b/meta/recipes-devtools/dosfstools/dosfstools/mkdosfs-bootcode.patch
index dd5cc7f..ae21bee 100644
--- a/meta/recipes-devtools/dosfstools/dosfstools/mkdosfs-bootcode.patch
+++ b/meta/recipes-devtools/dosfstools/dosfstools/mkdosfs-bootcode.patch
@@ -5,9 +5,10 @@ We're tracking an old release of dosfstools due to licensing issues.
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-diff -urN dosfstools-2.10.orig/mkdosfs/ChangeLog dosfstools-2.10/mkdosfs/ChangeLog
---- dosfstools-2.10.orig/mkdosfs/ChangeLog 1997-06-18 03:09:38.000000000 -0700
-+++ dosfstools-2.10/mkdosfs/ChangeLog 2004-08-02 20:57:57.734939816 -0700
+Index: dosfstools-2.11/mkdosfs/ChangeLog
+===================================================================
+--- dosfstools-2.11.orig/mkdosfs/ChangeLog 1997-06-18 10:09:38.000000000 +0000
++++ dosfstools-2.11/mkdosfs/ChangeLog 2011-12-06 12:14:23.634011558 +0000
@@ -1,3 +1,14 @@
+19th June 2003 Sam Bingner (sam@bingner.com)
+
@@ -23,10 +24,11 @@ diff -urN dosfstools-2.10.orig/mkdosfs/ChangeLog dosfstools-2.10/mkdosfs/ChangeL
28th January 1995 H. Peter Anvin (hpa@yggdrasil.com)
Better algorithm to select cluster sizes on large filesystems.
-diff -urN dosfstools-2.10.orig/mkdosfs/mkdosfs.8 dosfstools-2.10/mkdosfs/mkdosfs.8
---- dosfstools-2.10.orig/mkdosfs/mkdosfs.8 2003-05-15 11:28:28.000000000 -0700
-+++ dosfstools-2.10/mkdosfs/mkdosfs.8 2004-08-02 20:57:57.735939664 -0700
-@@ -40,6 +40,10 @@
+Index: dosfstools-2.11/mkdosfs/mkdosfs.8
+===================================================================
+--- dosfstools-2.11.orig/mkdosfs/mkdosfs.8 2004-02-25 19:36:07.000000000 +0000
++++ dosfstools-2.11/mkdosfs/mkdosfs.8 2011-12-06 12:19:54.777888434 +0000
+@@ -44,6 +44,10 @@
.I message-file
]
[
@@ -37,7 +39,7 @@ diff -urN dosfstools-2.10.orig/mkdosfs/mkdosfs.8 dosfstools-2.10/mkdosfs/mkdosfs
.B \-n
.I volume-name
]
-@@ -155,6 +159,18 @@
+@@ -165,6 +169,18 @@
carriage return-line feed combinations, and tabs have been expanded.
If the filename is a hyphen (-), the text is taken from standard input.
.TP
@@ -56,21 +58,22 @@ diff -urN dosfstools-2.10.orig/mkdosfs/mkdosfs.8 dosfstools-2.10/mkdosfs/mkdosfs
.BI \-n " volume-name"
Sets the volume name (label) of the filesystem. The volume name can
be up to 11 characters long. The default is no label.
-@@ -188,8 +204,9 @@
+@@ -198,8 +214,9 @@
simply will not support it ;)
.SH AUTHOR
Dave Hudson - <dave@humbug.demon.co.uk>; modified by Peter Anvin
-<hpa@yggdrasil.com>. Fixes and additions by Roman Hodek
--<Roman.Hodek@informatik.uni-erlangen.de> for Debian/GNU Linux.
+-<roman@hodek.net> for Debian/GNU Linux.
+<hpa@yggdrasil.com> and Sam Bingner <sam@bingner.com>. Fixes and
+additions by Roman Hodek <Roman.Hodek@informatik.uni-erlangen.de>
+for Debian/GNU Linux.
.SH ACKNOWLEDGEMENTS
.B mkdosfs
is based on code from
-diff -urN dosfstools-2.10.orig/mkdosfs/mkdosfs.c dosfstools-2.10/mkdosfs/mkdosfs.c
---- dosfstools-2.10.orig/mkdosfs/mkdosfs.c 2003-06-14 13:07:08.000000000 -0700
-+++ dosfstools-2.10/mkdosfs/mkdosfs.c 2004-08-02 20:57:57.736939512 -0700
+Index: dosfstools-2.11/mkdosfs/mkdosfs.c
+===================================================================
+--- dosfstools-2.11.orig/mkdosfs/mkdosfs.c 2005-03-12 16:12:16.000000000 +0000
++++ dosfstools-2.11/mkdosfs/mkdosfs.c 2011-12-06 12:27:55.121886076 +0000
@@ -24,6 +24,12 @@
- New options -A, -S, -C
- Support for filesystems > 2GB
@@ -84,7 +87,7 @@ diff -urN dosfstools-2.10.orig/mkdosfs/mkdosfs.c dosfstools-2.10/mkdosfs/mkdosfs
Copying: Copyright 1993, 1994 David Hudson (dave@humbug.demon.co.uk)
-@@ -167,6 +173,8 @@
+@@ -153,6 +159,8 @@
#define FAT_BAD 0x0ffffff7
#define MSDOS_EXT_SIGN 0x29 /* extended boot sector signature */
@@ -93,7 +96,7 @@ diff -urN dosfstools-2.10.orig/mkdosfs/mkdosfs.c dosfstools-2.10/mkdosfs/mkdosfs
#define MSDOS_FAT12_SIGN "FAT12 " /* FAT12 filesystem signature */
#define MSDOS_FAT16_SIGN "FAT16 " /* FAT16 filesystem signature */
#define MSDOS_FAT32_SIGN "FAT32 " /* FAT32 filesystem signature */
-@@ -188,6 +196,8 @@
+@@ -175,6 +183,8 @@
#define BOOTCODE_SIZE 448
#define BOOTCODE_FAT32_SIZE 420
@@ -102,7 +105,7 @@ diff -urN dosfstools-2.10.orig/mkdosfs/mkdosfs.c dosfstools-2.10/mkdosfs/mkdosfs
/* __attribute__ ((packed)) is used on all structures to make gcc ignore any
* alignments */
-@@ -215,7 +225,7 @@
+@@ -202,7 +212,7 @@
__u16 fat_length; /* sectors/FAT */
__u16 secs_track; /* sectors per track */
__u16 heads; /* number of heads */
@@ -111,7 +114,7 @@ diff -urN dosfstools-2.10.orig/mkdosfs/mkdosfs.c dosfstools-2.10/mkdosfs/mkdosfs
__u32 total_sect; /* number of sectors (if sectors == 0) */
union {
struct {
-@@ -298,6 +308,8 @@
+@@ -285,6 +295,8 @@
/* Global variables - the root of all evil :-) - see these and weep! */
@@ -120,7 +123,7 @@ diff -urN dosfstools-2.10.orig/mkdosfs/mkdosfs.c dosfstools-2.10/mkdosfs/mkdosfs
static char *program_name = "mkdosfs"; /* Name of the program */
static char *device_name = NULL; /* Name of the device on which to create the filesystem */
static int atari_format = 0; /* Use Atari variation of MS-DOS FS format */
-@@ -842,6 +854,12 @@
+@@ -837,6 +849,12 @@
vi->volume_id[2] = (unsigned char) ((volume_id & 0x00ff0000) >> 16);
vi->volume_id[3] = (unsigned char) (volume_id >> 24);
}
@@ -133,16 +136,7 @@ diff -urN dosfstools-2.10.orig/mkdosfs/mkdosfs.c dosfstools-2.10/mkdosfs/mkdosfs
if (!atari_format) {
memcpy(vi->volume_label, volume_name, 11);
-@@ -886,7 +904,7 @@
- printf( "Using %d reserved sectors\n", reserved_sectors );
- bs.fats = (char) nr_fats;
- if (!atari_format || size_fat == 32)
-- bs.hidden = CT_LE_L(0);
-+ bs.hidden = bs.secs_track;
- else
- /* In Atari format, hidden is a 16 bit field */
- memset( &bs.hidden, 0, 2 );
-@@ -1358,6 +1376,32 @@
+@@ -1362,6 +1380,32 @@
* dir area on FAT12/16, and the first cluster on FAT32. */
writebuf( (char *) root_dir, size_root_dir, "root directory" );
@@ -156,9 +150,9 @@ diff -urN dosfstools-2.10.orig/mkdosfs/mkdosfs.c dosfstools-2.10/mkdosfs/mkdosfs
+ seekto( 512*2, "third sector" );
+ if (backup_boot != 0) {
+ writebuf( template_boot_code+512*2, backup_boot*sector_size - 512*2, "data to backup boot" );
-+ seekto( backup_boot*sector_size, "backup boot sector" );
++ seekto( backup_boot*sector_size, "backup boot sector" );
+ writebuf( template_boot_code, 3, "backup jmpBoot" );
-+ seekto( backup_boot*sector_size+0x5a, "backup boot sector boot area" );
++ seekto( backup_boot*sector_size+0x5a, "backup boot sector boot area" );
+ writebuf( template_boot_code+0x5a, 420, "backup boot sector boot area" );
+ seekto( (backup_boot+2)*sector_size, "sector following backup code" );
+ writebuf( template_boot_code+(backup_boot+2)*sector_size, (reserved_sectors-backup_boot-2)*512, "remaining data" );
@@ -172,28 +166,28 @@ diff -urN dosfstools-2.10.orig/mkdosfs/mkdosfs.c dosfstools-2.10/mkdosfs/mkdosfs
+ }
+ }
+
+ if (blank_sector) free( blank_sector );
if (info_sector) free( info_sector );
free (root_dir); /* Free up the root directory space from setup_tables */
- free (fat); /* Free up the fat table space reserved during setup_tables */
-@@ -1371,7 +1415,7 @@
+@@ -1376,7 +1420,7 @@
{
fatal_error("\
Usage: mkdosfs [-A] [-c] [-C] [-v] [-I] [-l bad-block-file] [-b backup-boot-sector]\n\
- [-m boot-msg-file] [-n volume-name] [-i volume-id]\n\
+ [-m boot-msg-file] [-n volume-name] [-i volume-id] [-B bootcode]\n\
[-s sectors-per-cluster] [-S logical-sector-size] [-f number-of-FATs]\n\
- [-F fat-size] [-r root-dir-entries] [-R reserved-sectors]\n\
+ [-h hidden-sectors] [-F fat-size] [-r root-dir-entries] [-R reserved-sectors]\n\
/dev/name [blocks]\n");
-@@ -1433,7 +1477,7 @@
+@@ -1439,7 +1483,7 @@
printf ("%s " VERSION " (" VERSION_DATE ")\n",
program_name);
-- while ((c = getopt (argc, argv, "AcCf:F:Ii:l:m:n:r:R:s:S:v")) != EOF)
-+ while ((c = getopt (argc, argv, "AcCf:F:Ii:l:m:n:r:R:s:S:v:B:b")) != EOF)
+- while ((c = getopt (argc, argv, "AbcCf:F:Ii:l:m:n:r:R:s:S:h:v")) != EOF)
++ while ((c = getopt (argc, argv, "AbcCf:F:Ii:l:m:n:r:R:s:S:v:B:")) != EOF)
/* Scan the command line for options */
switch (c)
{
-@@ -1494,6 +1538,51 @@
+@@ -1509,6 +1553,51 @@
listfile = optarg;
break;
diff --git a/meta/recipes-devtools/dosfstools/dosfstools/mkdosfs-dir.patch b/meta/recipes-devtools/dosfstools/dosfstools/mkdosfs-dir.patch
index 7feee0f..3ba4711 100644
--- a/meta/recipes-devtools/dosfstools/dosfstools/mkdosfs-dir.patch
+++ b/meta/recipes-devtools/dosfstools/dosfstools/mkdosfs-dir.patch
@@ -1,13 +1,14 @@
-Add -s <directory> support to populate the image.
+Add -d <directory> support to populate the image.
Upstream-Status: Inappropriate [licensing]
We're tracking an old release of dosfstools due to licensing issues.
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-diff -urN dosfstools-2.10.orig/mkdosfs/mkdosfs.c dosfstools-2.10/mkdosfs/mkdosfs.c
---- dosfstools-2.10.orig/mkdosfs/mkdosfs.c 2004-08-02 20:48:45.000000000 -0700
-+++ dosfstools-2.10/mkdosfs/mkdosfs.c 2004-08-02 20:49:44.296953792 -0700
+Index: dosfstools-2.11/mkdosfs/mkdosfs.c
+===================================================================
+--- dosfstools-2.11.orig/mkdosfs/mkdosfs.c 2011-12-06 12:27:55.000000000 +0000
++++ dosfstools-2.11/mkdosfs/mkdosfs.c 2011-12-06 12:37:13.445950703 +0000
@@ -18,6 +18,10 @@
as a rule), and not the block. For example the boot block does not
occupy a full cluster.
@@ -26,18 +27,18 @@ diff -urN dosfstools-2.10.orig/mkdosfs/mkdosfs.c dosfstools-2.10/mkdosfs/mkdosfs
+#include <libgen.h>
+#include <dirent.h>
- #if __BYTE_ORDER == __BIG_ENDIAN
-
-@@ -124,6 +130,8 @@
- }
- #endif
+ #include <linux/version.h>
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+@@ -110,6 +116,8 @@
+ * sufficient (or even better :) for 64 bit offsets in the meantime */
+ #define llseek lseek
+#define ROUND_UP(value, divisor) (value + (divisor - (value % divisor))) / divisor
+
/* Constant definitions */
#define TRUE 1 /* Boolean constants */
-@@ -163,7 +171,6 @@
+@@ -149,7 +157,6 @@
#define ATTR_VOLUME 8 /* volume label */
#define ATTR_DIR 16 /* directory */
#define ATTR_ARCH 32 /* archived */
@@ -45,7 +46,7 @@ diff -urN dosfstools-2.10.orig/mkdosfs/mkdosfs.c dosfstools-2.10/mkdosfs/mkdosfs
#define ATTR_NONE 0 /* no attribute bits */
#define ATTR_UNUSED (ATTR_VOLUME | ATTR_ARCH | ATTR_SYS | ATTR_HIDDEN)
/* attribute bits that are copied "as is" */
-@@ -258,6 +265,19 @@
+@@ -245,6 +252,19 @@
__u32 reserved2[4];
};
@@ -65,7 +66,7 @@ diff -urN dosfstools-2.10.orig/mkdosfs/mkdosfs.c dosfstools-2.10/mkdosfs/mkdosfs
struct msdos_dir_entry
{
char name[8], ext[3]; /* name and extension */
-@@ -306,6 +326,15 @@
+@@ -293,6 +313,15 @@
#define MESSAGE_OFFSET 29 /* Offset of message in above code */
@@ -81,7 +82,7 @@ diff -urN dosfstools-2.10.orig/mkdosfs/mkdosfs.c dosfstools-2.10/mkdosfs/mkdosfs
/* Global variables - the root of all evil :-) - see these and weep! */
static char *template_boot_code; /* Variable to store a full template boot sector in */
-@@ -339,6 +368,9 @@
+@@ -326,6 +355,9 @@
static int size_root_dir; /* Size of the root directory in bytes */
static int sectors_per_cluster = 0; /* Number of sectors per disk cluster */
static int root_dir_entries = 0; /* Number of root directory entries */
@@ -89,9 +90,9 @@ diff -urN dosfstools-2.10.orig/mkdosfs/mkdosfs.c dosfstools-2.10/mkdosfs/mkdosfs
+static int last_cluster_written = 0;
+
static char *blank_sector; /* Blank sector - all zeros */
+ static int hidden_sectors = 0; /* Number of hidden sectors */
-
-@@ -411,7 +443,6 @@
+@@ -399,7 +431,6 @@
}
}
@@ -99,7 +100,7 @@ diff -urN dosfstools-2.10.orig/mkdosfs/mkdosfs.c dosfstools-2.10/mkdosfs/mkdosfs
/* Mark a specified sector as having a particular value in it's FAT entry */
static void
-@@ -1262,6 +1293,9 @@
+@@ -1266,6 +1297,9 @@
die ("unable to allocate space for root directory in memory");
}
@@ -109,7 +110,7 @@ diff -urN dosfstools-2.10.orig/mkdosfs/mkdosfs.c dosfstools-2.10/mkdosfs/mkdosfs
memset(root_dir, 0, size_root_dir);
if ( memcmp(volume_name, " ", 11) )
{
-@@ -1310,11 +1344,11 @@
+@@ -1314,11 +1348,11 @@
}
if (!(blank_sector = malloc( sector_size )))
@@ -124,7 +125,7 @@ diff -urN dosfstools-2.10.orig/mkdosfs/mkdosfs.c dosfstools-2.10/mkdosfs/mkdosfs
/* Write the new filesystem's data tables to wherever they're going to end up! */
#define error(str) \
-@@ -1336,7 +1370,7 @@
+@@ -1340,7 +1374,7 @@
do { \
int __size = (size); \
if (write (dev, buf, __size) != __size) \
@@ -133,7 +134,7 @@ diff -urN dosfstools-2.10.orig/mkdosfs/mkdosfs.c dosfstools-2.10/mkdosfs/mkdosfs
} while(0)
-@@ -1407,6 +1441,452 @@
+@@ -1412,6 +1446,452 @@
free (fat); /* Free up the fat table space reserved during setup_tables */
}
@@ -586,19 +587,16 @@ diff -urN dosfstools-2.10.orig/mkdosfs/mkdosfs.c dosfstools-2.10/mkdosfs/mkdosfs
/* Report the command usage and return a failure error code */
-@@ -1418,9 +1898,9 @@
+@@ -1423,7 +1903,7 @@
[-m boot-msg-file] [-n volume-name] [-i volume-id] [-B bootcode]\n\
[-s sectors-per-cluster] [-S logical-sector-size] [-f number-of-FATs]\n\
- [-F fat-size] [-r root-dir-entries] [-R reserved-sectors]\n\
+ [-h hidden-sectors] [-F fat-size] [-r root-dir-entries] [-R reserved-sectors]\n\
- /dev/name [blocks]\n");
+ [-d directory] /dev/name [blocks]\n");
}
--
-+
+
/*
- * ++roman: On m68k, check if this is an Atari; if yes, turn on Atari variant
- * of MS-DOS filesystem by default.
-@@ -1458,6 +1938,8 @@
+@@ -1463,6 +1943,8 @@
int c;
char *tmp;
char *listfile = NULL;
@@ -607,27 +605,27 @@ diff -urN dosfstools-2.10.orig/mkdosfs/mkdosfs.c dosfstools-2.10/mkdosfs/mkdosfs
FILE *msgfile;
struct stat statbuf;
int i = 0, pos, ch;
-@@ -1477,7 +1959,7 @@
+@@ -1483,7 +1965,7 @@
printf ("%s " VERSION " (" VERSION_DATE ")\n",
program_name);
-- while ((c = getopt (argc, argv, "AcCf:F:Ii:l:m:n:r:R:s:S:v:B:b")) != EOF)
-+ while ((c = getopt (argc, argv, "AcCd:f:F:Ii:l:m:n:r:R:s:S:v:B:b")) != EOF)
+- while ((c = getopt (argc, argv, "AbcCf:F:Ii:l:m:n:r:R:s:S:v:B:")) != EOF)
++ while ((c = getopt (argc, argv, "AbcCd:f:F:Ii:l:m:n:r:R:s:S:v:B:")) != EOF)
/* Scan the command line for options */
switch (c)
{
-@@ -1502,6 +1984,10 @@
+@@ -1508,6 +1990,10 @@
create = TRUE;
break;
-+ case 'd':
++ case 'd':
+ dirname = optarg;
+ break;
+
case 'f': /* f : Choose number of FATs */
nr_fats = (int) strtol (optarg, &tmp, 0);
if (*tmp || nr_fats < 1 || nr_fats > 4)
-@@ -1796,8 +2282,10 @@
+@@ -1811,8 +2297,10 @@
else if (listfile)
get_list_blocks (listfile);
diff --git a/meta/recipes-devtools/dosfstools/dosfstools_2.10.bb b/meta/recipes-devtools/dosfstools/dosfstools_2.10.bb
deleted file mode 100644
index c23c02d..0000000
--- a/meta/recipes-devtools/dosfstools/dosfstools_2.10.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-# dosfstools OE build file
-# Copyright (C) 2004-2006, Advanced Micro Devices, Inc. All Rights Reserved
-# Released under the MIT license (see packages/COPYING)
-
-DESCRIPTION = "DOS FAT Filesystem Utilities"
-
-SECTION = "base"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://mkdosfs/COPYING;md5=cbe67f08d6883bff587f615f0cc81aa8"
-PR = "r3"
-
-SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}.src.tar.gz \
- file://alignment_hack.patch \
- file://dosfstools-2.10-kernel-2.6.patch \
- file://msdos_fat12_undefined.patch \
- file://include-linux-types.patch"
-
-SRC_URI[md5sum] = "59a02f311a891af8787c4c9e28c6b89b"
-SRC_URI[sha256sum] = "55a7b2f5ea4506bde935ee3145573e1773427fc72283a36796c7c2cf861dd064"
-
-do_install () {
- oe_runmake "PREFIX=${D}" "SBINDIR=${D}${sbindir}" \
- "MANDIR=${D}${mandir}/man8" install
-}
diff --git a/meta/recipes-devtools/dosfstools/dosfstools_2.11.bb b/meta/recipes-devtools/dosfstools/dosfstools_2.11.bb
index 944d873..7d0080c 100644
--- a/meta/recipes-devtools/dosfstools/dosfstools_2.11.bb
+++ b/meta/recipes-devtools/dosfstools/dosfstools_2.11.bb
@@ -7,12 +7,15 @@ DESCRIPTION = "DOS FAT Filesystem Utilities"
SECTION = "base"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://mkdosfs/COPYING;md5=cbe67f08d6883bff587f615f0cc81aa8"
-PR = "r0"
+PR = "r1"
SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}.src.tar.gz \
- file://alignment_hack.patch \
+ file://mkdosfs-bootcode.patch \
+ file://mkdosfs-dir.patch \
+ file://alignment_hack.patch \
file://msdos_fat12_undefined.patch \
- file://include-linux-types.patch"
+ file://dosfstools-msdos_fs-types.patch \
+ file://include-linux-types.patch"
SRC_URI[md5sum] = "407d405ade410f7597d364ab5dc8c9f6"
SRC_URI[sha256sum] = "0eac6d12388b3d9ed78684529c1b0d9346fa2abbe406c4d4a3eb5a023c98a484"
@@ -21,3 +24,5 @@ do_install () {
oe_runmake "PREFIX=${D}" "SBINDIR=${D}${sbindir}" \
"MANDIR=${D}${mandir}/man8" install
}
+
+BBCLASSEXTEND = "native"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 10/26] u-boot: renamed dir from uboot to the more appropriate u-boot
2011-12-11 22:47 [CONSOLIDATED PULL 00/26] Round up of patches and pull Saul Wold
` (8 preceding siblings ...)
2011-12-11 22:47 ` [CONSOLIDATED PULL 09/26] dosfstools: update native to 2.11 Saul Wold
@ 2011-12-11 22:47 ` Saul Wold
2011-12-11 22:47 ` [CONSOLIDATED PULL 11/26] gst-fluendo.inc: remove unneccessary hack Saul Wold
` (16 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2011-12-11 22:47 UTC (permalink / raw)
To: openembedded-core
From: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
recipe dirs normally have the name of the (main) package and the official name is u-boot
Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
---
.../{uboot => u-boot}/files/fix-arm920t-eabi.patch | 0
...Drop-config.h-include-in-tools-imximage.h.patch | 0
...ove-LDSCRIPT-processing-to-the-top-level-.patch | 0
...Drop-config.h-include-in-tools-imximage.h.patch | 0
...ove-LDSCRIPT-processing-to-the-top-level-.patch | 0
.../{uboot => u-boot}/u-boot-mkimage_2011.03.bb | 0
.../{uboot => u-boot}/u-boot-mkimage_2011.06.bb | 0
meta/recipes-bsp/{uboot => u-boot}/u-boot.inc | 0
.../{uboot => u-boot}/u-boot_2011.03.bb | 0
.../{uboot => u-boot}/u-boot_2011.06.bb | 0
10 files changed, 0 insertions(+), 0 deletions(-)
rename meta/recipes-bsp/{uboot => u-boot}/files/fix-arm920t-eabi.patch (100%)
rename meta/recipes-bsp/{uboot => u-boot}/u-boot-mkimage-2011.03/0001-Drop-config.h-include-in-tools-imximage.h.patch (100%)
rename meta/recipes-bsp/{uboot => u-boot}/u-boot-mkimage-2011.03/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch (100%)
rename meta/recipes-bsp/{uboot => u-boot}/u-boot-mkimage/0001-Drop-config.h-include-in-tools-imximage.h.patch (100%)
rename meta/recipes-bsp/{uboot => u-boot}/u-boot-mkimage/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch (100%)
rename meta/recipes-bsp/{uboot => u-boot}/u-boot-mkimage_2011.03.bb (100%)
rename meta/recipes-bsp/{uboot => u-boot}/u-boot-mkimage_2011.06.bb (100%)
rename meta/recipes-bsp/{uboot => u-boot}/u-boot.inc (100%)
rename meta/recipes-bsp/{uboot => u-boot}/u-boot_2011.03.bb (100%)
rename meta/recipes-bsp/{uboot => u-boot}/u-boot_2011.06.bb (100%)
diff --git a/meta/recipes-bsp/uboot/files/fix-arm920t-eabi.patch b/meta/recipes-bsp/u-boot/files/fix-arm920t-eabi.patch
similarity index 100%
rename from meta/recipes-bsp/uboot/files/fix-arm920t-eabi.patch
rename to meta/recipes-bsp/u-boot/files/fix-arm920t-eabi.patch
diff --git a/meta/recipes-bsp/uboot/u-boot-mkimage-2011.03/0001-Drop-config.h-include-in-tools-imximage.h.patch b/meta/recipes-bsp/u-boot/u-boot-mkimage-2011.03/0001-Drop-config.h-include-in-tools-imximage.h.patch
similarity index 100%
rename from meta/recipes-bsp/uboot/u-boot-mkimage-2011.03/0001-Drop-config.h-include-in-tools-imximage.h.patch
rename to meta/recipes-bsp/u-boot/u-boot-mkimage-2011.03/0001-Drop-config.h-include-in-tools-imximage.h.patch
diff --git a/meta/recipes-bsp/uboot/u-boot-mkimage-2011.03/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch b/meta/recipes-bsp/u-boot/u-boot-mkimage-2011.03/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch
similarity index 100%
rename from meta/recipes-bsp/uboot/u-boot-mkimage-2011.03/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch
rename to meta/recipes-bsp/u-boot/u-boot-mkimage-2011.03/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch
diff --git a/meta/recipes-bsp/uboot/u-boot-mkimage/0001-Drop-config.h-include-in-tools-imximage.h.patch b/meta/recipes-bsp/u-boot/u-boot-mkimage/0001-Drop-config.h-include-in-tools-imximage.h.patch
similarity index 100%
rename from meta/recipes-bsp/uboot/u-boot-mkimage/0001-Drop-config.h-include-in-tools-imximage.h.patch
rename to meta/recipes-bsp/u-boot/u-boot-mkimage/0001-Drop-config.h-include-in-tools-imximage.h.patch
diff --git a/meta/recipes-bsp/uboot/u-boot-mkimage/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch b/meta/recipes-bsp/u-boot/u-boot-mkimage/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch
similarity index 100%
rename from meta/recipes-bsp/uboot/u-boot-mkimage/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch
rename to meta/recipes-bsp/u-boot/u-boot-mkimage/0002-config.mk-move-LDSCRIPT-processing-to-the-top-level-.patch
diff --git a/meta/recipes-bsp/uboot/u-boot-mkimage_2011.03.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2011.03.bb
similarity index 100%
rename from meta/recipes-bsp/uboot/u-boot-mkimage_2011.03.bb
rename to meta/recipes-bsp/u-boot/u-boot-mkimage_2011.03.bb
diff --git a/meta/recipes-bsp/uboot/u-boot-mkimage_2011.06.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2011.06.bb
similarity index 100%
rename from meta/recipes-bsp/uboot/u-boot-mkimage_2011.06.bb
rename to meta/recipes-bsp/u-boot/u-boot-mkimage_2011.06.bb
diff --git a/meta/recipes-bsp/uboot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
similarity index 100%
rename from meta/recipes-bsp/uboot/u-boot.inc
rename to meta/recipes-bsp/u-boot/u-boot.inc
diff --git a/meta/recipes-bsp/uboot/u-boot_2011.03.bb b/meta/recipes-bsp/u-boot/u-boot_2011.03.bb
similarity index 100%
rename from meta/recipes-bsp/uboot/u-boot_2011.03.bb
rename to meta/recipes-bsp/u-boot/u-boot_2011.03.bb
diff --git a/meta/recipes-bsp/uboot/u-boot_2011.06.bb b/meta/recipes-bsp/u-boot/u-boot_2011.06.bb
similarity index 100%
rename from meta/recipes-bsp/uboot/u-boot_2011.06.bb
rename to meta/recipes-bsp/u-boot/u-boot_2011.06.bb
--
1.7.6.4
^ permalink raw reply [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 11/26] gst-fluendo.inc: remove unneccessary hack
2011-12-11 22:47 [CONSOLIDATED PULL 00/26] Round up of patches and pull Saul Wold
` (9 preceding siblings ...)
2011-12-11 22:47 ` [CONSOLIDATED PULL 10/26] u-boot: renamed dir from uboot to the more appropriate u-boot Saul Wold
@ 2011-12-11 22:47 ` Saul Wold
2011-12-11 22:47 ` [CONSOLIDATED PULL 12/26] mdadm: Make custom CC definition conditional Saul Wold
` (15 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2011-12-11 22:47 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
This fixes bug: [YOCTO #1403]
the custom definition of CC was causing build isuses with x32 toolchain.
And also I found out that the hack is not neccessary anymore. the
affected gst-fluendo-mpegdemux recipe builds fine without the CC hack.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
meta/recipes-multimedia/gstreamer/gst-fluendo.inc | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-multimedia/gstreamer/gst-fluendo.inc b/meta/recipes-multimedia/gstreamer/gst-fluendo.inc
index 203bdba..8b24cf7 100644
--- a/meta/recipes-multimedia/gstreamer/gst-fluendo.inc
+++ b/meta/recipes-multimedia/gstreamer/gst-fluendo.inc
@@ -12,7 +12,3 @@ FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"
EXTRA_OECONF = "--disable-debug --disable-valgrind"
-
-# Hack to get STAGING_LIBDIR into the linker path when building
-CC = "${CCACHE} ${HOST_PREFIX}gcc -L${STAGING_LIBDIR}"
-
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 12/26] mdadm: Make custom CC definition conditional
2011-12-11 22:47 [CONSOLIDATED PULL 00/26] Round up of patches and pull Saul Wold
` (10 preceding siblings ...)
2011-12-11 22:47 ` [CONSOLIDATED PULL 11/26] gst-fluendo.inc: remove unneccessary hack Saul Wold
@ 2011-12-11 22:47 ` Saul Wold
2011-12-11 22:47 ` [CONSOLIDATED PULL 13/26] pulseaudio: fix compilation with x32 toolchain Saul Wold
` (14 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2011-12-11 22:47 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
By hardcoding CC's definition in the Makefile, all the gcc parameters
set by tune settings are lost. Causing compile failure with x32 toolchain
As the bitbake defined CC is good, there is no need to redfine CC in the
make file, hence making the CC definition in the Makefile conditional.
This fixes bug: [YOCTO #1414]
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
.../mdadm/files/mdadm-3.2.2_fix_for_x32.patch | 24 ++++++++++++++++++++
meta/recipes-extended/mdadm/mdadm_3.2.2.bb | 4 +-
2 files changed, 26 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-extended/mdadm/files/mdadm-3.2.2_fix_for_x32.patch
diff --git a/meta/recipes-extended/mdadm/files/mdadm-3.2.2_fix_for_x32.patch b/meta/recipes-extended/mdadm/files/mdadm-3.2.2_fix_for_x32.patch
new file mode 100644
index 0000000..79ba2cf
--- /dev/null
+++ b/meta/recipes-extended/mdadm/files/mdadm-3.2.2_fix_for_x32.patch
@@ -0,0 +1,24 @@
+UpstreamStatus: pending
+
+By hardcoding CC's definition in the Makefile, all the gcc parameters
+set by tune settings are lost. Causing compile failure with x32 toolchain
+
+As the bitbake defined CC is good, there is no need to redfine CC in the
+make file, hence making the CC definition in the Makefile conditional.
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/07
+
+Index: mdadm-3.2.2/Makefile
+===================================================================
+--- mdadm-3.2.2.orig/Makefile
++++ mdadm-3.2.2/Makefile
+@@ -40,7 +40,8 @@ KLIBC=/home/src/klibc/klibc-0.77
+
+ KLIBC_GCC = gcc -nostdinc -iwithprefix include -I$(KLIBC)/klibc/include -I$(KLIBC)/linux/include -I$(KLIBC)/klibc/arch/i386/include -I$(KLIBC)/klibc/include/bits32
+
+-CC = $(CROSS_COMPILE)gcc
++CC ?= $(CROSS_COMPILE)gcc
++
+ CXFLAGS = -ggdb
+ CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter
+ ifdef WARN_UNUSED
diff --git a/meta/recipes-extended/mdadm/mdadm_3.2.2.bb b/meta/recipes-extended/mdadm/mdadm_3.2.2.bb
index 97878ed..02109e3 100644
--- a/meta/recipes-extended/mdadm/mdadm_3.2.2.bb
+++ b/meta/recipes-extended/mdadm/mdadm_3.2.2.bb
@@ -8,10 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
file://mdmon.c;beginline=4;endline=18;md5=af7d8444d9c4d3e5c7caac0d9d34039d \
file://mdadm.h;beglinlne=4;endline=22;md5=462bc9936ac0d3da110191a3f9994161"
-PR = "r2"
+PR = "r3"
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2 \
file://0001-mdadm-fix-build-failures-ppc64.patch \
+ file://mdadm-3.2.2_fix_for_x32.patch \
"
SRC_URI[md5sum] = "12ee2fbf3beddb60601fb7a4c4905651"
@@ -22,7 +23,6 @@ CFLAGS += "-fno-strict-aliasing"
inherit autotools
do_compile() {
- export CROSS_COMPILE="${TARGET_PREFIX}"
oe_runmake
}
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 13/26] pulseaudio: fix compilation with x32 toolchain
2011-12-11 22:47 [CONSOLIDATED PULL 00/26] Round up of patches and pull Saul Wold
` (11 preceding siblings ...)
2011-12-11 22:47 ` [CONSOLIDATED PULL 12/26] mdadm: Make custom CC definition conditional Saul Wold
@ 2011-12-11 22:47 ` Saul Wold
2011-12-11 22:47 ` [CONSOLIDATED PULL 14/26] libacpi: Fix libdir for x32 Saul Wold
` (13 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2011-12-11 22:47 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
This commit makes assembly syntax compatible with x32 toolchain
to avoid these x32 gcc errors:
| pulsecore/svolume_mmx.c: Assembler messages:
| pulsecore/svolume_mmx.c:107: Error: `(%esi,%rdi,4)' is not a valid
base/index expression
| pulsecore/svolume_mmx.c:135: Error: `(%esi,%rdi,4)' is not a valid
base/index expression
| pulsecore/svolume_mmx.c:161: Error: `(%esi,%rdi,4)' is not a valid
base/index expression
| pulsecore/svolume_mmx.c:162: Error: `8(%esi,%rdi,4)' is not a valid
base/index expression
| pulsecore/svolume_mmx.c:180: Error: `(%esi,%rdi,4)' is not a valid
base/index expression
| pulsecore/svolume_mmx.c:210: Error: `(%esi,%rdi,4)' is not a valid
base/index expression
| pulsecore/svolume_mmx.c:244: Error: `(%esi,%rdi,4)' is not a valid
base/index expression
| pulsecore/svolume_mmx.c:245: Error: `8(%esi,%rdi,4)' is not a valid
base/index expression
| make[3]: *** [libpulsecore_1.1_la-svolume_mmx.lo] Error 1
Orignally these assembly lines are written for x86_64 ABI, now they are
also compatible with
X32 ABI.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
.../pulseaudio/pulseaudo_fix_for_x32.patch | 238 ++++++++++++++++++++
.../pulseaudio/pulseaudio_1.1.bb | 3 +-
2 files changed, 240 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudo_fix_for_x32.patch
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudo_fix_for_x32.patch b/meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudo_fix_for_x32.patch
new file mode 100644
index 0000000..39dad32
--- /dev/null
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio/pulseaudo_fix_for_x32.patch
@@ -0,0 +1,238 @@
+UpstreamStatus: Pending
+
+This patch makes assembly syntax compatible to the x32 toolchain.
+
+This fixes these kinds of compilations errors with x32 gcc.
+| pulsecore/svolume_mmx.c: Assembler messages:
+| pulsecore/svolume_mmx.c:107: Error: `(%esi,%rdi,4)' is not a valid base/index expression
+| pulsecore/svolume_mmx.c:135: Error: `(%esi,%rdi,4)' is not a valid base/index expression
+| pulsecore/svolume_mmx.c:161: Error: `(%esi,%rdi,4)' is not a valid base/index expression
+| pulsecore/svolume_mmx.c:162: Error: `8(%esi,%rdi,4)' is not a valid base/index expression
+| pulsecore/svolume_mmx.c:180: Error: `(%esi,%rdi,4)' is not a valid base/index expression
+| pulsecore/svolume_mmx.c:210: Error: `(%esi,%rdi,4)' is not a valid base/index expression
+| pulsecore/svolume_mmx.c:244: Error: `(%esi,%rdi,4)' is not a valid base/index expression
+| pulsecore/svolume_mmx.c:245: Error: `8(%esi,%rdi,4)' is not a valid base/index expression
+| make[3]: *** [libpulsecore_1.1_la-svolume_mmx.lo] Error 1
+
+Orignally these assembly lines are written for x86_64 ABI, now they are also compatible with
+X32 ABI.
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/03
+Index: pulseaudio-1.1/src/pulsecore/svolume_mmx.c
+===================================================================
+--- pulseaudio-1.1.orig/src/pulsecore/svolume_mmx.c
++++ pulseaudio-1.1/src/pulsecore/svolume_mmx.c
+@@ -107,7 +107,7 @@ static void pa_volume_s16ne_mmx(int16_t
+ " test $1, %2 \n\t" /* check for odd samples */
+ " je 2f \n\t"
+
+- " movd (%1, %3, 4), %%mm0 \n\t" /* | v0h | v0l | */
++ " movd (%q1, %3, 4), %%mm0 \n\t" /* | v0h | v0l | */
+ " movw (%0), %w4 \n\t" /* .. | p0 | */
+ " movd %4, %%mm1 \n\t"
+ VOLUME_32x16 (%%mm1, %%mm0)
+@@ -122,7 +122,7 @@ static void pa_volume_s16ne_mmx(int16_t
+ " je 4f \n\t"
+
+ "3: \n\t" /* do samples in groups of 2 */
+- " movq (%1, %3, 4), %%mm0 \n\t" /* | v1h | v1l | v0h | v0l | */
++ " movq (%q1, %3, 4), %%mm0 \n\t" /* | v1h | v1l | v0h | v0l | */
+ " movd (%0), %%mm1 \n\t" /* .. | p1 | p0 | */
+ VOLUME_32x16 (%%mm1, %%mm0)
+ " movd %%mm0, (%0) \n\t" /* .. | p1*v1 | p0*v0 | */
+@@ -135,8 +135,8 @@ static void pa_volume_s16ne_mmx(int16_t
+ " je 6f \n\t"
+
+ "5: \n\t" /* do samples in groups of 4 */
+- " movq (%1, %3, 4), %%mm0 \n\t" /* | v1h | v1l | v0h | v0l | */
+- " movq 8(%1, %3, 4), %%mm2 \n\t" /* | v3h | v3l | v2h | v2l | */
++ " movq (%q1, %3, 4), %%mm0 \n\t" /* | v1h | v1l | v0h | v0l | */
++ " movq 8(%q1, %3, 4), %%mm2 \n\t" /* | v3h | v3l | v2h | v2l | */
+ " movd (%0), %%mm1 \n\t" /* .. | p1 | p0 | */
+ " movd 4(%0), %%mm3 \n\t" /* .. | p3 | p2 | */
+ VOLUME_32x16 (%%mm1, %%mm0)
+@@ -180,7 +180,7 @@ static void pa_volume_s16re_mmx(int16_t
+ " test $1, %2 \n\t" /* check for odd samples */
+ " je 2f \n\t"
+
+- " movd (%1, %3, 4), %%mm0 \n\t" /* | v0h | v0l | */
++ " movd (%q1, %3, 4), %%mm0 \n\t" /* | v0h | v0l | */
+ " movw (%0), %w4 \n\t" /* .. | p0 | */
+ " rorw $8, %w4 \n\t"
+ " movd %4, %%mm1 \n\t"
+@@ -197,7 +197,7 @@ static void pa_volume_s16re_mmx(int16_t
+ " je 4f \n\t"
+
+ "3: \n\t" /* do samples in groups of 2 */
+- " movq (%1, %3, 4), %%mm0 \n\t" /* | v1h | v1l | v0h | v0l | */
++ " movq (%q1, %3, 4), %%mm0 \n\t" /* | v1h | v1l | v0h | v0l | */
+ " movd (%0), %%mm1 \n\t" /* .. | p1 | p0 | */
+ SWAP_16 (%%mm1)
+ VOLUME_32x16 (%%mm1, %%mm0)
+@@ -212,8 +212,8 @@ static void pa_volume_s16re_mmx(int16_t
+ " je 6f \n\t"
+
+ "5: \n\t" /* do samples in groups of 4 */
+- " movq (%1, %3, 4), %%mm0 \n\t" /* | v1h | v1l | v0h | v0l | */
+- " movq 8(%1, %3, 4), %%mm2 \n\t" /* | v3h | v3l | v2h | v2l | */
++ " movq (%q1, %3, 4), %%mm0 \n\t" /* | v1h | v1l | v0h | v0l | */
++ " movq 8(%q1, %3, 4), %%mm2 \n\t" /* | v3h | v3l | v2h | v2l | */
+ " movd (%0), %%mm1 \n\t" /* .. | p1 | p0 | */
+ " movd 4(%0), %%mm3 \n\t" /* .. | p3 | p2 | */
+ SWAP_16_2 (%%mm1, %%mm3)
+Index: pulseaudio-1.1/src/pulsecore/svolume_sse.c
+===================================================================
+--- pulseaudio-1.1.orig/src/pulsecore/svolume_sse.c
++++ pulseaudio-1.1/src/pulsecore/svolume_sse.c
+@@ -92,7 +92,7 @@ static void pa_volume_s16ne_sse2(int16_t
+ " test $1, %2 \n\t" /* check for odd samples */
+ " je 2f \n\t"
+
+- " movd (%1, %3, 4), %%xmm0 \n\t" /* | v0h | v0l | */
++ " movd (%q1, %3, 4), %%xmm0 \n\t" /* | v0h | v0l | */
+ " movw (%0), %w4 \n\t" /* .. | p0 | */
+ " movd %4, %%xmm1 \n\t"
+ VOLUME_32x16 (%%xmm1, %%xmm0)
+@@ -107,7 +107,7 @@ static void pa_volume_s16ne_sse2(int16_t
+ " je 4f \n\t"
+
+ "3: \n\t" /* do samples in groups of 2 */
+- " movq (%1, %3, 4), %%xmm0 \n\t" /* | v1h | v1l | v0h | v0l | */
++ " movq (%q1, %3, 4), %%xmm0 \n\t" /* | v1h | v1l | v0h | v0l | */
+ " movd (%0), %%xmm1 \n\t" /* .. | p1 | p0 | */
+ VOLUME_32x16 (%%xmm1, %%xmm0)
+ " movd %%xmm0, (%0) \n\t" /* .. | p1*v1 | p0*v0 | */
+@@ -123,7 +123,7 @@ static void pa_volume_s16ne_sse2(int16_t
+ * that the array is 16 bytes aligned, we probably have to do the odd values
+ * after this then. */
+ "5: \n\t" /* do samples in groups of 4 */
+- " movdqu (%1, %3, 4), %%xmm0 \n\t" /* | v3h | v3l .. v0h | v0l | */
++ " movdqu (%q1, %3, 4), %%xmm0 \n\t" /* | v3h | v3l .. v0h | v0l | */
+ " movq (%0), %%xmm1 \n\t" /* .. | p3 .. p0 | */
+ VOLUME_32x16 (%%xmm1, %%xmm0)
+ " movq %%xmm0, (%0) \n\t" /* .. | p3*v3 .. p0*v0 | */
+@@ -136,8 +136,8 @@ static void pa_volume_s16ne_sse2(int16_t
+ " je 8f \n\t"
+
+ "7: \n\t" /* do samples in groups of 8 */
+- " movdqu (%1, %3, 4), %%xmm0 \n\t" /* | v3h | v3l .. v0h | v0l | */
+- " movdqu 16(%1, %3, 4), %%xmm2 \n\t" /* | v7h | v7l .. v4h | v4l | */
++ " movdqu (%q1, %3, 4), %%xmm0 \n\t" /* | v3h | v3l .. v0h | v0l | */
++ " movdqu 16(%q1, %3, 4), %%xmm2 \n\t" /* | v7h | v7l .. v4h | v4l | */
+ " movq (%0), %%xmm1 \n\t" /* .. | p3 .. p0 | */
+ " movq 8(%0), %%xmm3 \n\t" /* .. | p7 .. p4 | */
+ VOLUME_32x16 (%%xmm1, %%xmm0)
+@@ -176,7 +176,7 @@ static void pa_volume_s16re_sse2(int16_t
+ " test $1, %2 \n\t" /* check for odd samples */
+ " je 2f \n\t"
+
+- " movd (%1, %3, 4), %%xmm0 \n\t" /* | v0h | v0l | */
++ " movd (%q1, %3, 4), %%xmm0 \n\t" /* | v0h | v0l | */
+ " movw (%0), %w4 \n\t" /* .. | p0 | */
+ " rorw $8, %w4 \n\t"
+ " movd %4, %%xmm1 \n\t"
+@@ -193,7 +193,7 @@ static void pa_volume_s16re_sse2(int16_t
+ " je 4f \n\t"
+
+ "3: \n\t" /* do samples in groups of 2 */
+- " movq (%1, %3, 4), %%xmm0 \n\t" /* | v1h | v1l | v0h | v0l | */
++ " movq (%q1, %3, 4), %%xmm0 \n\t" /* | v1h | v1l | v0h | v0l | */
+ " movd (%0), %%xmm1 \n\t" /* .. | p1 | p0 | */
+ SWAP_16 (%%xmm1)
+ VOLUME_32x16 (%%xmm1, %%xmm0)
+@@ -211,7 +211,7 @@ static void pa_volume_s16re_sse2(int16_t
+ * that the array is 16 bytes aligned, we probably have to do the odd values
+ * after this then. */
+ "5: \n\t" /* do samples in groups of 4 */
+- " movdqu (%1, %3, 4), %%xmm0 \n\t" /* | v3h | v3l .. v0h | v0l | */
++ " movdqu (%q1, %3, 4), %%xmm0 \n\t" /* | v3h | v3l .. v0h | v0l | */
+ " movq (%0), %%xmm1 \n\t" /* .. | p3 .. p0 | */
+ SWAP_16 (%%xmm1)
+ VOLUME_32x16 (%%xmm1, %%xmm0)
+@@ -226,8 +226,8 @@ static void pa_volume_s16re_sse2(int16_t
+ " je 8f \n\t"
+
+ "7: \n\t" /* do samples in groups of 8 */
+- " movdqu (%1, %3, 4), %%xmm0 \n\t" /* | v3h | v3l .. v0h | v0l | */
+- " movdqu 16(%1, %3, 4), %%xmm2 \n\t" /* | v7h | v7l .. v4h | v4l | */
++ " movdqu (%q1, %3, 4), %%xmm0 \n\t" /* | v3h | v3l .. v0h | v0l | */
++ " movdqu 16(%q1, %3, 4), %%xmm2 \n\t" /* | v7h | v7l .. v4h | v4l | */
+ " movq (%0), %%xmm1 \n\t" /* .. | p3 .. p0 | */
+ " movq 8(%0), %%xmm3 \n\t" /* .. | p7 .. p4 | */
+ SWAP_16_2 (%%xmm1, %%xmm3)
+Index: pulseaudio-1.1/src/pulsecore/sconv_sse.c
+===================================================================
+--- pulseaudio-1.1.orig/src/pulsecore/sconv_sse.c
++++ pulseaudio-1.1/src/pulsecore/sconv_sse.c
+@@ -54,8 +54,8 @@ static void pa_sconv_s16le_from_f32ne_ss
+ " je 2f \n\t"
+
+ "1: \n\t"
+- " movups (%2, %0, 2), %%xmm0 \n\t" /* read 8 floats */
+- " movups 16(%2, %0, 2), %%xmm2 \n\t"
++ " movups (%q2, %0, 2), %%xmm0 \n\t" /* read 8 floats */
++ " movups 16(%q2, %0, 2), %%xmm2 \n\t"
+ " minps %%xmm5, %%xmm0 \n\t" /* clamp to 1.0 */
+ " minps %%xmm5, %%xmm2 \n\t"
+ " maxps %%xmm6, %%xmm0 \n\t" /* clamp to -1.0 */
+@@ -72,8 +72,8 @@ static void pa_sconv_s16le_from_f32ne_ss
+
+ " packssdw %%mm1, %%mm0 \n\t" /* pack parts */
+ " packssdw %%mm3, %%mm2 \n\t"
+- " movq %%mm0, (%3, %0) \n\t"
+- " movq %%mm2, 8(%3, %0) \n\t"
++ " movq %%mm0, (%q3, %0) \n\t"
++ " movq %%mm2, 8(%q3, %0) \n\t"
+
+ " add $16, %0 \n\t"
+ " dec %1 \n\t"
+@@ -85,12 +85,12 @@ static void pa_sconv_s16le_from_f32ne_ss
+ " je 4f \n\t"
+
+ "3: \n\t"
+- " movss (%2, %0, 2), %%xmm0 \n\t"
++ " movss (%q2, %0, 2), %%xmm0 \n\t"
+ " minss %%xmm5, %%xmm0 \n\t"
+ " maxss %%xmm6, %%xmm0 \n\t"
+ " mulss %%xmm7, %%xmm0 \n\t"
+ " cvtss2si %%xmm0, %4 \n\t"
+- " movw %w4, (%3, %0) \n\t"
++ " movw %w4, (%q3, %0) \n\t"
+ " add $2, %0 \n\t"
+ " dec %1 \n\t"
+ " jne 3b \n\t"
+@@ -119,8 +119,8 @@ static void pa_sconv_s16le_from_f32ne_ss
+ " je 2f \n\t"
+
+ "1: \n\t"
+- " movups (%2, %0, 2), %%xmm0 \n\t" /* read 8 floats */
+- " movups 16(%2, %0, 2), %%xmm2 \n\t"
++ " movups (%q2, %0, 2), %%xmm0 \n\t" /* read 8 floats */
++ " movups 16(%q2, %0, 2), %%xmm2 \n\t"
+ " minps %%xmm5, %%xmm0 \n\t" /* clamp to 1.0 */
+ " minps %%xmm5, %%xmm2 \n\t"
+ " maxps %%xmm6, %%xmm0 \n\t" /* clamp to -1.0 */
+@@ -132,7 +132,7 @@ static void pa_sconv_s16le_from_f32ne_ss
+ " cvtps2dq %%xmm2, %%xmm2 \n\t"
+
+ " packssdw %%xmm2, %%xmm0 \n\t"
+- " movdqu %%xmm0, (%3, %0) \n\t"
++ " movdqu %%xmm0, (%q3, %0) \n\t"
+
+ " add $16, %0 \n\t"
+ " dec %1 \n\t"
+@@ -144,12 +144,12 @@ static void pa_sconv_s16le_from_f32ne_ss
+ " je 4f \n\t"
+
+ "3: \n\t"
+- " movss (%2, %0, 2), %%xmm0 \n\t"
++ " movss (%q2, %0, 2), %%xmm0 \n\t"
+ " minss %%xmm5, %%xmm0 \n\t"
+ " maxss %%xmm6, %%xmm0 \n\t"
+ " mulss %%xmm7, %%xmm0 \n\t"
+ " cvtss2si %%xmm0, %4 \n\t"
+- " movw %w4, (%3, %0) \n\t"
++ " movw %w4, (%q3, %0) \n\t"
+ " add $2, %0 \n\t"
+ " dec %1 \n\t"
+ " jne 3b \n\t"
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb b/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb
index 4c8b46f..93db782 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio_1.1.bb
@@ -1,6 +1,6 @@
require pulseaudio.inc
-PR = "r4"
+PR = "r5"
DEPENDS += "libjson gdbm speex libxml-parser-perl-native"
@@ -8,6 +8,7 @@ inherit gettext perlnative
SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PV}.tar.xz \
file://volatiles.04_pulse \
+ file://pulseaudo_fix_for_x32.patch \
"
SRC_URI[md5sum] = "17d21df798cee407b769c6355fae397a"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 14/26] libacpi: Fix libdir for x32
2011-12-11 22:47 [CONSOLIDATED PULL 00/26] Round up of patches and pull Saul Wold
` (12 preceding siblings ...)
2011-12-11 22:47 ` [CONSOLIDATED PULL 13/26] pulseaudio: fix compilation with x32 toolchain Saul Wold
@ 2011-12-11 22:47 ` Saul Wold
2011-12-11 22:47 ` [CONSOLIDATED PULL 15/26] findutils: Fix compilation for x32 toolchain Saul Wold
` (12 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2011-12-11 22:47 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
libacpi doesn't use base_libdir for install. This patch adds
base_libdir support so that x32 libraries are installed properly.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
---
.../libacpi/files/libacpi_fix_for_x32.patch | 47 ++++++++++++++++++++
meta/recipes-bsp/libacpi/libacpi_0.2.bb | 5 +-
2 files changed, 50 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch
diff --git a/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch b/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch
new file mode 100644
index 0000000..5f2d034
--- /dev/null
+++ b/meta/recipes-bsp/libacpi/files/libacpi_fix_for_x32.patch
@@ -0,0 +1,47 @@
+UpstreamStatus: Pending
+
+Fix libacpi for x32
+
+ libacpi doesn't use base_libdir for install. This patch adds
+ base_libdir support so that x32 libraries are installed properly.
+
+Patch Received from: H.J. Lu <hjl.tools@gmail.com>
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/05
+
+Index: libacpi-0.2/Makefile
+===================================================================
+--- libacpi-0.2.orig/Makefile
++++ libacpi-0.2/Makefile
+@@ -8,6 +8,10 @@ SRC_test = test-libacpi.c libacpi.c list
+ OBJ = ${SRC:.c=.o}
+ OBJ_test = ${SRC_test:.c=.o}
+
++ifndef base_libdir
++base_libdir=/lib
++endif
++
+ all: options libacpi.a libacpi.so test-libacpi
+
+ options:
+@@ -42,13 +46,13 @@ install: all
+ @mkdir -p ${DESTDIR}${PREFIX}/include
+ @cp -f libacpi.h ${DESTDIR}${PREFIX}/include
+ @chmod 644 ${DESTDIR}${PREFIX}/include/libacpi.h
+- @echo installing library to ${DESTDIR}${PREFIX}/lib
+- @mkdir -p ${DESTDIR}${PREFIX}/lib
+- @cp -f libacpi.a ${DESTDIR}${PREFIX}/lib
+- @chmod 644 ${DESTDIR}${PREFIX}/lib/libacpi.a
+- @cp -f ${SONAME} ${DESTDIR}${PREFIX}/lib/
+- @chmod 644 ${DESTDIR}${PREFIX}/lib/${SONAME}
+- @ln -s ${SONAME} ${DESTDIR}${PREFIX}/lib/libacpi.so
++ @echo installing library to ${DESTDIR}${PREFIX}${base_libdir}
++ @mkdir -p ${DESTDIR}${PREFIX}${base_libdir}
++ @cp -f libacpi.a ${DESTDIR}${PREFIX}${base_libdir}
++ @chmod 644 ${DESTDIR}${PREFIX}${base_libdir}/libacpi.a
++ @cp -f ${SONAME} ${DESTDIR}${PREFIX}${base_libdir}/
++ @chmod 644 ${DESTDIR}${PREFIX}${base_libdir}/${SONAME}
++ @ln -s ${SONAME} ${DESTDIR}${PREFIX}${base_libdir}/libacpi.so
+ @echo installing test-libacpi to ${DESTDIR}${PREFIX}/bin
+ @mkdir -p ${DESTDIR}${PREFIX}/bin
+ @cp -f test-libacpi ${DESTDIR}${PREFIX}/bin
diff --git a/meta/recipes-bsp/libacpi/libacpi_0.2.bb b/meta/recipes-bsp/libacpi/libacpi_0.2.bb
index 7c5095d..82fe8f8 100644
--- a/meta/recipes-bsp/libacpi/libacpi_0.2.bb
+++ b/meta/recipes-bsp/libacpi/libacpi_0.2.bb
@@ -5,10 +5,11 @@ SECTION = "base"
HOMEPAGE = "http://www.ngolde.de/libacpi.html"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=fec17f82f16630adf2dfb7d2a46f21c5"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://www.ngolde.de/download/libacpi-${PV}.tar.gz \
- file://makefile-fix.patch "
+ file://makefile-fix.patch \
+ file://libacpi_fix_for_x32.patch "
SRC_URI[md5sum] = "05b53dd7bead66dda35fec502b91066c"
SRC_URI[sha256sum] = "13086e31d428b9c125954d48ac497b754bbbce2ef34ea29ecd903e82e25bad29"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 15/26] findutils: Fix compilation for x32 toolchain
2011-12-11 22:47 [CONSOLIDATED PULL 00/26] Round up of patches and pull Saul Wold
` (13 preceding siblings ...)
2011-12-11 22:47 ` [CONSOLIDATED PULL 14/26] libacpi: Fix libdir for x32 Saul Wold
@ 2011-12-11 22:47 ` Saul Wold
2011-12-11 22:47 ` [CONSOLIDATED PULL 16/26] mesa: Properly create share library for x32 Saul Wold
` (11 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2011-12-11 22:47 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Work around gnulib time_t assumption in findutils for x32
time_t is 64bit and long int is 32bit on x32. But gnulib used in
findutils assumes time_t values fit into long int. Such assumption is
invalid for x32 and should be removed.
This patch is a workaround to compile gnulib for x32.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-Off-By: H.J. Lu <hjl.tools@gmail.com>
---
.../findutils-4.4.2/findutils_fix_for_x32.patch | 40 ++++++++++++++++++++
meta/recipes-extended/findutils/findutils_4.4.2.bb | 5 +-
2 files changed, 43 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-extended/findutils/findutils-4.4.2/findutils_fix_for_x32.patch
diff --git a/meta/recipes-extended/findutils/findutils-4.4.2/findutils_fix_for_x32.patch b/meta/recipes-extended/findutils/findutils-4.4.2/findutils_fix_for_x32.patch
new file mode 100644
index 0000000..dd2ab0e
--- /dev/null
+++ b/meta/recipes-extended/findutils/findutils-4.4.2/findutils_fix_for_x32.patch
@@ -0,0 +1,40 @@
+UpstreamStatus: Pending
+
+Author: H.J. Lu <hjl.tools@gmail.com>
+
+Work around gnulib time_t assumption in findutils for x32
+
+time_t is 64bit and long int is 32bit on x32. But gnulib used in
+findutils assumes time_t values fit into long int. Such assumption is
+invalid for x32 and should be removed.
+
+This patch is a workaround to compile gnulib for x32.
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/05
+
+
+Index: findutils-4.4.2/gnulib/lib/getdate.y
+===================================================================
+--- findutils-4.4.2.orig/gnulib/lib/getdate.y
++++ findutils-4.4.2/gnulib/lib/getdate.y
+@@ -114,7 +114,6 @@
+ wraps around, but there's no portable way to check for that at
+ compile-time. */
+ verify (TYPE_IS_INTEGER (time_t));
+-verify (LONG_MIN <= TYPE_MINIMUM (time_t) && TYPE_MAXIMUM (time_t) <= LONG_MAX);
+
+ /* An integer value, and the number of digits in its textual
+ representation. */
+Index: findutils-4.4.2/gnulib/lib/mktime.c
+===================================================================
+--- findutils-4.4.2.orig/gnulib/lib/mktime.c
++++ findutils-4.4.2/gnulib/lib/mktime.c
+@@ -166,7 +166,7 @@ ydhms_diff (long int year1, long int yda
+ {
+ verify (C99_integer_division, -1 / 2 == 0);
+ verify (long_int_year_and_yday_are_wide_enough,
+- INT_MAX <= LONG_MAX / 2 || TIME_T_MAX <= UINT_MAX);
++ INT_MAX <= TIME_T_MAX / 2 || TIME_T_MAX <= UINT_MAX);
+
+ /* Compute intervening leap days correctly even if year is negative.
+ Take care to avoid integer overflow here. */
diff --git a/meta/recipes-extended/findutils/findutils_4.4.2.bb b/meta/recipes-extended/findutils/findutils_4.4.2.bb
index cfc6546..c25ba4c 100644
--- a/meta/recipes-extended/findutils/findutils_4.4.2.bb
+++ b/meta/recipes-extended/findutils/findutils_4.4.2.bb
@@ -1,10 +1,11 @@
require findutils.inc
-PR = "r0"
+PR = "r1"
SRC_URI += "file://01-27017.patch \
file://02-28824.patch \
- file://03-28872.patch"
+ file://03-28872.patch \
+ file://findutils_fix_for_x32.patch "
SRC_URI[md5sum] = "351cc4adb07d54877fa15f75fb77d39f"
SRC_URI[sha256sum] = "434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 16/26] mesa: Properly create share library for x32
2011-12-11 22:47 [CONSOLIDATED PULL 00/26] Round up of patches and pull Saul Wold
` (14 preceding siblings ...)
2011-12-11 22:47 ` [CONSOLIDATED PULL 15/26] findutils: Fix compilation for x32 toolchain Saul Wold
@ 2011-12-11 22:47 ` Saul Wold
2011-12-11 22:47 ` [CONSOLIDATED PULL 17/26] pax: fix compilation with x32 toolchain Saul Wold
` (10 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2011-12-11 22:47 UTC (permalink / raw)
To: openembedded-core
From: "H.J. Lu" <hjl.tools@gmail.com>
Also pass -mx32 parameter to gcc to create create share library
for x32.
Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-Off-By: H.J. Lu <hjl.tools@gmail.com>
---
.../mesa/mesa/mesa_fix_for_x32.patch | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch b/meta/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch
index 22a2339..dfd67fe 100644
--- a/meta/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch
+++ b/meta/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch
@@ -4,10 +4,10 @@ get correct compiler options for x32 gcc.
Received this patch from H.J. Lu <hjl.tools@gmail.com>
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/01
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/06
---- Mesa-7.11/bin/mklib.x32 2011-11-30 14:29:14.976465283 -0800
-+++ Mesa-7.11/bin/mklib 2011-11-30 14:32:48.591525193 -0800
+--- Mesa-7.11/bin/mklib.x32 2011-12-06 13:15:17.968695114 -0800
++++ Mesa-7.11/bin/mklib 2011-12-06 13:17:13.872152249 -0800
@@ -335,7 +335,12 @@ case $ARCH in
set ${OBJECTS}
ABI32=`file $1 | grep 32-bit`
@@ -22,3 +22,17 @@ Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/01
fi
if [ "${ALTOPTS}" ] ; then
+@@ -392,7 +397,12 @@ case $ARCH in
+ set ${OBJECTS}
+ ABI32=`file $1 | grep 32-bit`
+ if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
+- OPTS="-m32 ${OPTS}"
++ ABIX32=`file $1 | grep x86-64`
++ if [ "${ABI32}" ]; then
++ OPTS="-mx32 ${OPTS}"
++ else
++ OPTS="-m32 ${OPTS}"
++ fi
+ fi
+ if [ "${ALTOPTS}" ] ; then
+ OPTS=${ALTOPTS}
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 17/26] pax: fix compilation with x32 toolchain
2011-12-11 22:47 [CONSOLIDATED PULL 00/26] Round up of patches and pull Saul Wold
` (15 preceding siblings ...)
2011-12-11 22:47 ` [CONSOLIDATED PULL 16/26] mesa: Properly create share library for x32 Saul Wold
@ 2011-12-11 22:47 ` Saul Wold
2011-12-11 22:47 ` [CONSOLIDATED PULL 18/26] siteinfo: create a new siteinfo for x32-linux Saul Wold
` (9 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2011-12-11 22:47 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
off_t is 8byte for x32. We need to check both _FILE_OFFSET_BITS and
size of off_t to see if file offset is 64bit. This patch adds
AC_CHECK_SIZEOF(off_t) and checks SIZEOF_OFF_T == 8.
Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
.../pax/pax/pax-3.4_fix_for_x32.patch | 185 ++++++++++++++++++++
meta/recipes-extended/pax/pax_3.4.bb | 5 +-
2 files changed, 188 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-extended/pax/pax/pax-3.4_fix_for_x32.patch
diff --git a/meta/recipes-extended/pax/pax/pax-3.4_fix_for_x32.patch b/meta/recipes-extended/pax/pax/pax-3.4_fix_for_x32.patch
new file mode 100644
index 0000000..11dfa0f
--- /dev/null
+++ b/meta/recipes-extended/pax/pax/pax-3.4_fix_for_x32.patch
@@ -0,0 +1,185 @@
+UpstreamStatus: Pending
+
+Author: H.J. Lu <hjl.tools@gmail.com>
+Date: Tue Dec 6 10:34:53 2011 -0800
+
+ Fix pax-3.4 build for x32
+
+ off_t is 8byte for x32. We need to check both _FILE_OFFSET_BITS and
+ size of off_t to see if file offset is 64bit. This patch adds
+ AC_CHECK_SIZEOF(off_t) and checks SIZEOF_OFF_T == 8.
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/06
+
+Index: pax-3.4/configure.in
+===================================================================
+--- pax-3.4.orig/configure.in
++++ pax-3.4/configure.in
+@@ -33,4 +33,7 @@ dnl Checks for header files.
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+
++AC_CHECK_SIZEOF(off_t)
++AC_CHECK_SIZEOF(long)
++
+ AC_OUTPUT([Makefile lib/Makefile src/Makefile])
+Index: pax-3.4/src/ar_io.c
+===================================================================
+--- pax-3.4.orig/src/ar_io.c
++++ pax-3.4/src/ar_io.c
+@@ -378,7 +378,8 @@ ar_close(void)
+ * could have written anything yet.
+ */
+ if (frmt == NULL) {
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+ (void)fprintf(listf, "%s: unknown format, %qu bytes skipped.\n",
+ #else
+ (void)fprintf(listf, "%s: unknown format, %lu bytes skipped.\n",
+@@ -391,7 +392,8 @@ ar_close(void)
+
+ if (strcmp(NM_CPIO, argv0) == 0)
+ (void)fprintf(listf,
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+ "%qu blocks\n",
+ #else
+ "%lu blocks\n",
+@@ -399,7 +401,8 @@ ar_close(void)
+ (rdcnt ? rdcnt : wrcnt) / 5120);
+ else if (strcmp(NM_TAR, argv0) != 0)
+ (void)fprintf(listf,
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+ "%s: %s vol %d, %lu files, %qu bytes read, %qu bytes written.\n",
+ #else
+ "%s: %s vol %d, %lu files, %lu bytes read, %lu bytes written.\n",
+Index: pax-3.4/src/cpio.c
+===================================================================
+--- pax-3.4.orig/src/cpio.c
++++ pax-3.4/src/cpio.c
+@@ -218,7 +218,8 @@ rd_ln_nm (ARCHD *arcn)
+ */
+ if ((arcn->sb.st_size == 0) ||
+ (arcn->sb.st_size >= (off_t) sizeof(arcn->ln_name))) {
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+ paxwarn (1, "Cpio link name length is invalid: %qu",
+ arcn->sb.st_size);
+ #else
+Index: pax-3.4/src/gen_subs.c
+===================================================================
+--- pax-3.4.orig/src/gen_subs.c
++++ pax-3.4/src/gen_subs.c
+@@ -133,7 +133,8 @@ ls_list (ARCHD *arcn, time_t now, FILE *
+ * print device id's for devices, or sizes for other nodes
+ */
+ if ((arcn->type == PAX_CHR) || (arcn->type == PAX_BLK))
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+ (void) fprintf (fp, "%4lu,%4lu ", (unsigned long) MAJOR (sbp->st_rdev),
+ (unsigned long) MINOR (sbp->st_rdev));
+ #else
+@@ -142,7 +143,8 @@ ls_list (ARCHD *arcn, time_t now, FILE *
+ #endif
+ else
+ {
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+ (void) fprintf (fp, "%9qu ", sbp->st_size);
+ #else
+ (void) fprintf (fp, "%9lu ", sbp->st_size);
+@@ -334,7 +336,8 @@ ul_asc (u_long val, char *str, int len,
+ return (0);
+ }
+
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+ /*
+ * asc_uqd()
+ * convert hex/octal character string into a u_quad_t. We do not have to
+Index: pax-3.4/src/options.c
+===================================================================
+--- pax-3.4.orig/src/options.c
++++ pax-3.4/src/options.c
+@@ -1545,7 +1545,8 @@ str_offt (char *val)
+ char *expr;
+ off_t num, t;
+
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+ num = strtoq (val, &expr, 0);
+ if ((num == LONG_LONG_MAX) || (num <= 0) || (expr == val))
+ #else
+Index: pax-3.4/src/tar.c
+===================================================================
+--- pax-3.4.orig/src/tar.c
++++ pax-3.4/src/tar.c
+@@ -58,7 +58,8 @@
+ static unsigned long tar_chksm (char *, int);
+ static char *name_split (char *, int);
+ static int ul_oct (u_long, char *, int, int);
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+ static int uqd_oct (u_quad_t, char *, int, int);
+ #endif
+
+@@ -196,7 +197,8 @@ ul_oct (u_long val, register char *str,
+ return (0);
+ }
+
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+ /*
+ * uqd_oct()
+ * convert an u_quad_t to an octal string. one of many oddball field
+@@ -427,7 +429,8 @@ tar_rd (ARCHD *arcn, char *buf)
+ 0xfff);
+ arcn->sb.st_uid = (uid_t) asc_ul (hd->uid, sizeof (hd->uid), OCT);
+ arcn->sb.st_gid = (gid_t) asc_ul (hd->gid, sizeof (hd->gid), OCT);
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+ arcn->sb.st_size = (off_t) asc_uqd (hd->size, sizeof (hd->size), OCT);
+ #else
+ arcn->sb.st_size = (off_t) asc_ul (hd->size, sizeof (hd->size), OCT);
+@@ -659,7 +662,8 @@ tar_wr (register ARCHD * arcn)
+ * data follows this file, so set the pad
+ */
+ hd->linkflag = AREGTYPE;
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+ if (uqd_oct ((u_quad_t) arcn->sb.st_size, hd->size,
+ sizeof (hd->size), 1))
+ #else
+@@ -834,7 +838,8 @@ ustar_rd (ARCHD *arcn, char *buf)
+ */
+ arcn->sb.st_mode = (mode_t) (asc_ul (hd->mode, sizeof (hd->mode), OCT) &
+ 0xfff);
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+ arcn->sb.st_size = (off_t) asc_uqd (hd->size, sizeof (hd->size), OCT);
+ #else
+ arcn->sb.st_size = (off_t) asc_ul (hd->size, sizeof (hd->size), OCT);
+@@ -1081,7 +1086,8 @@ ustar_wr (register ARCHD * arcn)
+ else
+ hd->typeflag = REGTYPE;
+ arcn->pad = TAR_PAD (arcn->sb.st_size);
+-#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
++#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
++ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
+ if (uqd_oct ((u_quad_t) arcn->sb.st_size, hd->size,
+ sizeof (hd->size), 3))
+ {
diff --git a/meta/recipes-extended/pax/pax_3.4.bb b/meta/recipes-extended/pax/pax_3.4.bb
index e9c70d6..0c10688 100644
--- a/meta/recipes-extended/pax/pax_3.4.bb
+++ b/meta/recipes-extended/pax/pax_3.4.bb
@@ -10,10 +10,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4b0b674dfdc56daa3832d4069b820ea0 \
file://lib/vis.h;endline=40;md5=b283f759abd4a5ad7e014b80f51fc053"
SECTION = "base"
-PR = "r1"
+PR = "r2"
SRC_URI = "ftp://ftp.suse.com/pub/people/kukuk/pax/pax-${PV}.tar.bz2 \
- file://fix_for_compile_with_gcc-4.6.0.patch"
+ file://fix_for_compile_with_gcc-4.6.0.patch \
+ file://pax-3.4_fix_for_x32.patch"
SRC_URI[md5sum] = "fbd9023b590b45ac3ade95870702a0d6"
SRC_URI[sha256sum] = "ac3c06048e02828077cf7757d3d142241429238893b91d529af29a2e8cc5623b"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 18/26] siteinfo: create a new siteinfo for x32-linux
2011-12-11 22:47 [CONSOLIDATED PULL 00/26] Round up of patches and pull Saul Wold
` (16 preceding siblings ...)
2011-12-11 22:47 ` [CONSOLIDATED PULL 17/26] pax: fix compilation with x32 toolchain Saul Wold
@ 2011-12-11 22:47 ` Saul Wold
2011-12-11 22:47 ` [CONSOLIDATED PULL 19/26] libacpi: Use the cross strip instead of host strip Saul Wold
` (8 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2011-12-11 22:47 UTC (permalink / raw)
To: openembedded-core
From: "H.J. Lu" <hjl.tools@gmail.com>
X32 has different sizes for many types:
1. off_t and ino_t are 8 byte, instead of 4 byte.
2. pthread_mutex_t is 32byte, instead of 24 byte.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
---
meta/classes/siteinfo.bbclass | 2 +-
meta/site/x32-linux | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletions(-)
create mode 100644 meta/site/x32-linux
diff --git a/meta/classes/siteinfo.bbclass b/meta/classes/siteinfo.bbclass
index 604c6ba..bf6af2b 100644
--- a/meta/classes/siteinfo.bbclass
+++ b/meta/classes/siteinfo.bbclass
@@ -76,7 +76,7 @@ def siteinfo_data(d):
"x86_64-linux": "bit-64",
"x86_64-linux-uclibc": "bit-64",
"x86_64-linux-gnu": "bit-64 x86_64-linux",
- "x86_64-linux-gnux32": "bit-32 ix86-common",
+ "x86_64-linux-gnux32": "bit-32 ix86-common x32-linux",
"x86_64-mingw32": "bit-64",
}
diff --git a/meta/site/x32-linux b/meta/site/x32-linux
new file mode 100644
index 0000000..7ce6551
--- /dev/null
+++ b/meta/site/x32-linux
@@ -0,0 +1,9 @@
+# general
+ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double=16}
+ac_cv_sizeof_off_t=${ac_cv_sizeof_off_t=8}
+ac_cv_sizeof_ino_t=${ac_cv_sizeof_ino_t=8}
+ac_cv_sizeof_dev_t=${ac_cv_sizeof_dev_t=8}
+ac_cv_sys_file_offset_bits=${ac_cv_sys_file_offset_bits=64}
+
+# glib
+glib_cv_sizeof_gmutex=${glib_cv_sizeof_gmutex=32}
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 19/26] libacpi: Use the cross strip instead of host strip
2011-12-11 22:47 [CONSOLIDATED PULL 00/26] Round up of patches and pull Saul Wold
` (17 preceding siblings ...)
2011-12-11 22:47 ` [CONSOLIDATED PULL 18/26] siteinfo: create a new siteinfo for x32-linux Saul Wold
@ 2011-12-11 22:47 ` Saul Wold
2011-12-11 22:47 ` [CONSOLIDATED PULL 20/26] openssl-1.0.0e: Update x32 Configure Saul Wold
` (7 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2011-12-11 22:47 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
to avoid this build error on x32:
| strip: Unable to recognise the format of the input file `test-libacpi'
| make: *** [test-libacpi] Error 1
| ERROR: oe_runmake failed
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
.../use_correct_strip_in_cross_environment.patch | 23 ++++++++++++++++++++
meta/recipes-bsp/libacpi/libacpi_0.2.bb | 5 ++-
2 files changed, 26 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-bsp/libacpi/files/use_correct_strip_in_cross_environment.patch
diff --git a/meta/recipes-bsp/libacpi/files/use_correct_strip_in_cross_environment.patch b/meta/recipes-bsp/libacpi/files/use_correct_strip_in_cross_environment.patch
new file mode 100644
index 0000000..c9ad668
--- /dev/null
+++ b/meta/recipes-bsp/libacpi/files/use_correct_strip_in_cross_environment.patch
@@ -0,0 +1,23 @@
+UpstreamStatus: Pending
+
+Used the cross strip instead of host strip to avoid this build error:
+
+| strip: Unable to recognise the format of the input file `test-libacpi'
+| make: *** [test-libacpi] Error 1
+| ERROR: oe_runmake failed
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/07
+
+Index: libacpi-0.2/Makefile
+===================================================================
+--- libacpi-0.2.orig/Makefile
++++ libacpi-0.2/Makefile
+@@ -39,7 +39,7 @@ libacpi.so: ${OBJ}
+ test-libacpi: ${OBJ_test}
+ @echo LD $@
+ @${CC} -o $@ ${OBJ_test} ${LDFLAGS}
+- @strip $@
++ @${STRIP} $@
+
+ install: all
+ @echo installing header to ${DESTDIR}${PREFIX}/include
diff --git a/meta/recipes-bsp/libacpi/libacpi_0.2.bb b/meta/recipes-bsp/libacpi/libacpi_0.2.bb
index 82fe8f8..2d98fae 100644
--- a/meta/recipes-bsp/libacpi/libacpi_0.2.bb
+++ b/meta/recipes-bsp/libacpi/libacpi_0.2.bb
@@ -5,11 +5,12 @@ SECTION = "base"
HOMEPAGE = "http://www.ngolde.de/libacpi.html"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=fec17f82f16630adf2dfb7d2a46f21c5"
-PR = "r3"
+PR = "r4"
SRC_URI = "http://www.ngolde.de/download/libacpi-${PV}.tar.gz \
file://makefile-fix.patch \
- file://libacpi_fix_for_x32.patch "
+ file://libacpi_fix_for_x32.patch \
+ file://use_correct_strip_in_cross_environment.patch"
SRC_URI[md5sum] = "05b53dd7bead66dda35fec502b91066c"
SRC_URI[sha256sum] = "13086e31d428b9c125954d48ac497b754bbbce2ef34ea29ecd903e82e25bad29"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 20/26] openssl-1.0.0e: Update x32 Configure
2011-12-11 22:47 [CONSOLIDATED PULL 00/26] Round up of patches and pull Saul Wold
` (18 preceding siblings ...)
2011-12-11 22:47 ` [CONSOLIDATED PULL 19/26] libacpi: Use the cross strip instead of host strip Saul Wold
@ 2011-12-11 22:47 ` Saul Wold
2011-12-11 22:47 ` [CONSOLIDATED PULL 21/26] x86 tune: fix TUNE_PKGARCH definition for proper PACKAGE_ARCH Saul Wold
` (6 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2011-12-11 22:47 UTC (permalink / raw)
To: openembedded-core
From: "H.J. Lu" <hjl.tools@gmail.com>
Make linux-x32 as close to linux-x86_64 as possible:
1. Add -mx32 -DMD32_REG_T=int.
2. Changed to -O3.
3. Remove -pipe -g -feliminate-unused-debug-types.
4. Remove -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS.
5. Add :::x32 for multilib.
Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-Off-By: H.J. Lu <hjl.tools@gmail.com>
---
.../openssl-1.0.0e/openssl_fix_for_x32.patch | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0e/openssl_fix_for_x32.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0e/openssl_fix_for_x32.patch
index 10de986..2dbcd01 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0e/openssl_fix_for_x32.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0e/openssl_fix_for_x32.patch
@@ -14,7 +14,7 @@ Index: openssl-1.0.0e/Configure
"linux-ia64-ecc","ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"linux-ia64-icc","icc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_INT:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
-+"linux-x32", "gcc:-DL_ENDIAN -DTERMIO -O2 -pipe -g -feliminate-unused-debug-types -Wall -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-x32", "gcc:-mx32 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT RC4_CHUNK DES_INT DES_UNROLL:${x86_64_asm}:elf:dlfcn:linux-shared:-fPIC:-mx32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::x32",
"linux-s390x", "gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL:${s390x_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::64",
#### SPARC Linux setups
# Ray Miller <ray.miller@computing-services.oxford.ac.uk> has patiently
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 21/26] x86 tune: fix TUNE_PKGARCH definition for proper PACKAGE_ARCH
2011-12-11 22:47 [CONSOLIDATED PULL 00/26] Round up of patches and pull Saul Wold
` (19 preceding siblings ...)
2011-12-11 22:47 ` [CONSOLIDATED PULL 20/26] openssl-1.0.0e: Update x32 Configure Saul Wold
@ 2011-12-11 22:47 ` Saul Wold
2011-12-11 22:47 ` [CONSOLIDATED PULL 22/26] scripts/send-pull-request: fix typo Saul Wold
` (5 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2011-12-11 22:47 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
rpmbuild can not handle the PACKAGE_ARCH of these kinds:
x86_64-x32, core2-64, core2-64-x32
With these kinds of PACKAGE_ARCH the --target parameter of rpmbuild
becomes like: core2-64-x32-poky-linux-gnux32 ; And rpmbuild extracts
%_target (arch) wrongly as core2 generating these kinds of rpms with
incorrect filenames: zip-3.0-r0.core2.rpm
So this commit fixes the issue by making PACKAGE_ARCH like this:
x86_64_x32, core2_64, core2_64_x32
Now --target parameter of rpmbuild becomes like:
core2_64_x32-poky-linux-gnux32 ; And rpmbuild extracts %_target (arch)
correctly as core2_64_x32 generating these kinds of rpms with correct
filenames: zip-3.0-r0.core2_64_x32.rpm
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
meta/conf/machine/include/ia32/arch-ia32.inc | 4 ++--
meta/conf/machine/include/tune-core2.inc | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/conf/machine/include/ia32/arch-ia32.inc b/meta/conf/machine/include/ia32/arch-ia32.inc
index ee91983..0931c26 100644
--- a/meta/conf/machine/include/ia32/arch-ia32.inc
+++ b/meta/conf/machine/include/ia32/arch-ia32.inc
@@ -45,5 +45,5 @@ PACKAGE_EXTRA_ARCHS_tune-x86-64 = "x86_64"
AVAILTUNES += "x86-64-x32"
TUNE_FEATURES_tune-x86-64-x32 ?= "mx32"
BASE_LIB_tune-x86-64-x32 ?= "libx32"
-PACKAGE_EXTRA_ARCHS_tune-x86-64-x32 = "x86_64-x32"
-TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "mx32", "-x32", "", d)}"
+PACKAGE_EXTRA_ARCHS_tune-x86-64-x32 = "x86_64_x32"
+TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "mx32", "_x32", "", d)}"
diff --git a/meta/conf/machine/include/tune-core2.inc b/meta/conf/machine/include/tune-core2.inc
index 565a39c..7cde511 100644
--- a/meta/conf/machine/include/tune-core2.inc
+++ b/meta/conf/machine/include/tune-core2.inc
@@ -1,5 +1,5 @@
DEFAULTTUNE ?= "core2"
-TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "m32", "core2", "core2-64", d)}"
+TUNE_PKGARCH ?= "${@bb.utils.contains("TUNE_FEATURES", "m32", "core2", "core2_64", d)}"
require conf/machine/include/tune-i586.inc
@@ -16,9 +16,9 @@ PACKAGE_EXTRA_ARCHS_tune-core2 = "${PACKAGE_EXTRA_ARCHS_tune-x86} i386 i486 i586
AVAILTUNES += "core2-64"
TUNE_FEATURES_tune-core2-64 ?= "${TUNE_FEATURES_tune-x86-64} core2"
BASE_LIB_tune-core2-64 ?= "lib64"
-PACKAGE_EXTRA_ARCHS_tune-core2-64 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64} core2-64"
+PACKAGE_EXTRA_ARCHS_tune-core2-64 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64} core2_64"
AVAILTUNES += "core2-64-x32"
TUNE_FEATURES_tune-core2-64-x32 ?= "${TUNE_FEATURES_tune-x86-64-x32} core2"
BASE_LIB_tune-core2-64-x32 ?= "libx32"
-PACKAGE_EXTRA_ARCHS_tune-core2-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64-x32} core2-64-x32"
+PACKAGE_EXTRA_ARCHS_tune-core2-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64-x32} core2_64_x32"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 22/26] scripts/send-pull-request: fix typo
2011-12-11 22:47 [CONSOLIDATED PULL 00/26] Round up of patches and pull Saul Wold
` (20 preceding siblings ...)
2011-12-11 22:47 ` [CONSOLIDATED PULL 21/26] x86 tune: fix TUNE_PKGARCH definition for proper PACKAGE_ARCH Saul Wold
@ 2011-12-11 22:47 ` Saul Wold
2011-12-11 22:47 ` [CONSOLIDATED PULL 23/26] license: PR bump failure Saul Wold
` (4 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2011-12-11 22:47 UTC (permalink / raw)
To: openembedded-core
From: Otavio Salvador <otavio@ossystems.com.br>
s/No cover letter will be send./No cover letter will be sent./
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
scripts/send-pull-request | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/scripts/send-pull-request b/scripts/send-pull-request
index 8d51ce2..09f4245 100755
--- a/scripts/send-pull-request
+++ b/scripts/send-pull-request
@@ -118,7 +118,7 @@ if [ -e $PDIR/0000-cover-letter.patch ]; then
fi
done
else
- echo "WARNING: No cover letter will be send."
+ echo "WARNING: No cover letter will be sent."
fi
# Harvest emails from the generated patches and populate AUTO_CC.
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 23/26] license: PR bump failure
2011-12-11 22:47 [CONSOLIDATED PULL 00/26] Round up of patches and pull Saul Wold
` (21 preceding siblings ...)
2011-12-11 22:47 ` [CONSOLIDATED PULL 22/26] scripts/send-pull-request: fix typo Saul Wold
@ 2011-12-11 22:47 ` Saul Wold
2011-12-11 22:47 ` [CONSOLIDATED PULL 24/26] qemu-0.15.1: Bump recipes from 0.15.0 to 0.15.1 Saul Wold
` (3 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2011-12-11 22:47 UTC (permalink / raw)
To: openembedded-core
From: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
This addtask for do_populate_lic should be reverted back
to before do_package as before do_compile causes failures
when recipes are updated.
[YOCTO #1819]
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
---
meta/classes/license.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 4689aaf..dd5d1bc 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -6,7 +6,7 @@
LICENSE_DIRECTORY ??= "${DEPLOY_DIR}/licenses"
LICSSTATEDIR = "${WORKDIR}/license-destdir/"
-addtask populate_lic after do_patch before do_compile
+addtask populate_lic after do_patch before do_package
do_populate_lic[dirs] = "${LICSSTATEDIR}/${PN}"
do_populate_lic[cleandirs] = "${LICSSTATEDIR}"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 24/26] qemu-0.15.1: Bump recipes from 0.15.0 to 0.15.1
2011-12-11 22:47 [CONSOLIDATED PULL 00/26] Round up of patches and pull Saul Wold
` (22 preceding siblings ...)
2011-12-11 22:47 ` [CONSOLIDATED PULL 23/26] license: PR bump failure Saul Wold
@ 2011-12-11 22:47 ` Saul Wold
2011-12-11 22:47 ` [CONSOLIDATED PULL 25/26] task-core-nfs: Add nfs-utils-client to RDEPENDS Saul Wold
` (2 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2011-12-11 22:47 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
No other changes (except checksum updates) then git mv were needed
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../{qemu-0.15.0 => qemu-0.15.1}/arm-bgr.patch | 0
.../enable-i386-linux-user.patch | 0
.../fallback-to-safe-mmap_min_addr.patch | 0
.../fix-configure-checks.patch | 0
.../{qemu-0.15.0 => qemu-0.15.1}/fix-nogl.patch | 0
.../{qemu-0.15.0 => qemu-0.15.1}/glflags.patch | 0
.../{qemu-0.15.0 => qemu-0.15.1}/init-info.patch | 0
.../larger_default_ram_size.patch | 0
.../linker-flags.patch | 0
.../{qemu-0.15.0 => qemu-0.15.1}/no-strip.patch | 0
.../opengl-sdl-fix.patch | 0
.../{qemu-0.15.0 => qemu-0.15.1}/powerpc_rom.bin | Bin 4096 -> 4096 bytes
.../qemu-git-qemugl-host.patch | 0
.../qemu-vmware-vga-depth.patch | 0
.../qemugl-allow-glxcontext-release.patch | 0
.../{qemu-0.15.0 => qemu-0.15.1}/qemugl-fix.patch | 0
.../qemu/{qemu_0.15.0.bb => qemu_0.15.1.bb} | 6 ++----
17 files changed, 2 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/qemu/{qemu-0.15.0 => qemu-0.15.1}/arm-bgr.patch (100%)
rename meta/recipes-devtools/qemu/{qemu-0.15.0 => qemu-0.15.1}/enable-i386-linux-user.patch (100%)
rename meta/recipes-devtools/qemu/{qemu-0.15.0 => qemu-0.15.1}/fallback-to-safe-mmap_min_addr.patch (100%)
rename meta/recipes-devtools/qemu/{qemu-0.15.0 => qemu-0.15.1}/fix-configure-checks.patch (100%)
rename meta/recipes-devtools/qemu/{qemu-0.15.0 => qemu-0.15.1}/fix-nogl.patch (100%)
rename meta/recipes-devtools/qemu/{qemu-0.15.0 => qemu-0.15.1}/glflags.patch (100%)
rename meta/recipes-devtools/qemu/{qemu-0.15.0 => qemu-0.15.1}/init-info.patch (100%)
rename meta/recipes-devtools/qemu/{qemu-0.15.0 => qemu-0.15.1}/larger_default_ram_size.patch (100%)
rename meta/recipes-devtools/qemu/{qemu-0.15.0 => qemu-0.15.1}/linker-flags.patch (100%)
rename meta/recipes-devtools/qemu/{qemu-0.15.0 => qemu-0.15.1}/no-strip.patch (100%)
rename meta/recipes-devtools/qemu/{qemu-0.15.0 => qemu-0.15.1}/opengl-sdl-fix.patch (100%)
rename meta/recipes-devtools/qemu/{qemu-0.15.0 => qemu-0.15.1}/powerpc_rom.bin (100%)
rename meta/recipes-devtools/qemu/{qemu-0.15.0 => qemu-0.15.1}/qemu-git-qemugl-host.patch (100%)
rename meta/recipes-devtools/qemu/{qemu-0.15.0 => qemu-0.15.1}/qemu-vmware-vga-depth.patch (100%)
rename meta/recipes-devtools/qemu/{qemu-0.15.0 => qemu-0.15.1}/qemugl-allow-glxcontext-release.patch (100%)
rename meta/recipes-devtools/qemu/{qemu-0.15.0 => qemu-0.15.1}/qemugl-fix.patch (100%)
rename meta/recipes-devtools/qemu/{qemu_0.15.0.bb => qemu_0.15.1.bb} (88%)
diff --git a/meta/recipes-devtools/qemu/qemu-0.15.0/arm-bgr.patch b/meta/recipes-devtools/qemu/qemu-0.15.1/arm-bgr.patch
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-0.15.0/arm-bgr.patch
rename to meta/recipes-devtools/qemu/qemu-0.15.1/arm-bgr.patch
diff --git a/meta/recipes-devtools/qemu/qemu-0.15.0/enable-i386-linux-user.patch b/meta/recipes-devtools/qemu/qemu-0.15.1/enable-i386-linux-user.patch
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-0.15.0/enable-i386-linux-user.patch
rename to meta/recipes-devtools/qemu/qemu-0.15.1/enable-i386-linux-user.patch
diff --git a/meta/recipes-devtools/qemu/qemu-0.15.0/fallback-to-safe-mmap_min_addr.patch b/meta/recipes-devtools/qemu/qemu-0.15.1/fallback-to-safe-mmap_min_addr.patch
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-0.15.0/fallback-to-safe-mmap_min_addr.patch
rename to meta/recipes-devtools/qemu/qemu-0.15.1/fallback-to-safe-mmap_min_addr.patch
diff --git a/meta/recipes-devtools/qemu/qemu-0.15.0/fix-configure-checks.patch b/meta/recipes-devtools/qemu/qemu-0.15.1/fix-configure-checks.patch
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-0.15.0/fix-configure-checks.patch
rename to meta/recipes-devtools/qemu/qemu-0.15.1/fix-configure-checks.patch
diff --git a/meta/recipes-devtools/qemu/qemu-0.15.0/fix-nogl.patch b/meta/recipes-devtools/qemu/qemu-0.15.1/fix-nogl.patch
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-0.15.0/fix-nogl.patch
rename to meta/recipes-devtools/qemu/qemu-0.15.1/fix-nogl.patch
diff --git a/meta/recipes-devtools/qemu/qemu-0.15.0/glflags.patch b/meta/recipes-devtools/qemu/qemu-0.15.1/glflags.patch
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-0.15.0/glflags.patch
rename to meta/recipes-devtools/qemu/qemu-0.15.1/glflags.patch
diff --git a/meta/recipes-devtools/qemu/qemu-0.15.0/init-info.patch b/meta/recipes-devtools/qemu/qemu-0.15.1/init-info.patch
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-0.15.0/init-info.patch
rename to meta/recipes-devtools/qemu/qemu-0.15.1/init-info.patch
diff --git a/meta/recipes-devtools/qemu/qemu-0.15.0/larger_default_ram_size.patch b/meta/recipes-devtools/qemu/qemu-0.15.1/larger_default_ram_size.patch
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-0.15.0/larger_default_ram_size.patch
rename to meta/recipes-devtools/qemu/qemu-0.15.1/larger_default_ram_size.patch
diff --git a/meta/recipes-devtools/qemu/qemu-0.15.0/linker-flags.patch b/meta/recipes-devtools/qemu/qemu-0.15.1/linker-flags.patch
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-0.15.0/linker-flags.patch
rename to meta/recipes-devtools/qemu/qemu-0.15.1/linker-flags.patch
diff --git a/meta/recipes-devtools/qemu/qemu-0.15.0/no-strip.patch b/meta/recipes-devtools/qemu/qemu-0.15.1/no-strip.patch
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-0.15.0/no-strip.patch
rename to meta/recipes-devtools/qemu/qemu-0.15.1/no-strip.patch
diff --git a/meta/recipes-devtools/qemu/qemu-0.15.0/opengl-sdl-fix.patch b/meta/recipes-devtools/qemu/qemu-0.15.1/opengl-sdl-fix.patch
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-0.15.0/opengl-sdl-fix.patch
rename to meta/recipes-devtools/qemu/qemu-0.15.1/opengl-sdl-fix.patch
diff --git a/meta/recipes-devtools/qemu/qemu-0.15.0/powerpc_rom.bin b/meta/recipes-devtools/qemu/qemu-0.15.1/powerpc_rom.bin
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-0.15.0/powerpc_rom.bin
rename to meta/recipes-devtools/qemu/qemu-0.15.1/powerpc_rom.bin
diff --git a/meta/recipes-devtools/qemu/qemu-0.15.0/qemu-git-qemugl-host.patch b/meta/recipes-devtools/qemu/qemu-0.15.1/qemu-git-qemugl-host.patch
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-0.15.0/qemu-git-qemugl-host.patch
rename to meta/recipes-devtools/qemu/qemu-0.15.1/qemu-git-qemugl-host.patch
diff --git a/meta/recipes-devtools/qemu/qemu-0.15.0/qemu-vmware-vga-depth.patch b/meta/recipes-devtools/qemu/qemu-0.15.1/qemu-vmware-vga-depth.patch
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-0.15.0/qemu-vmware-vga-depth.patch
rename to meta/recipes-devtools/qemu/qemu-0.15.1/qemu-vmware-vga-depth.patch
diff --git a/meta/recipes-devtools/qemu/qemu-0.15.0/qemugl-allow-glxcontext-release.patch b/meta/recipes-devtools/qemu/qemu-0.15.1/qemugl-allow-glxcontext-release.patch
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-0.15.0/qemugl-allow-glxcontext-release.patch
rename to meta/recipes-devtools/qemu/qemu-0.15.1/qemugl-allow-glxcontext-release.patch
diff --git a/meta/recipes-devtools/qemu/qemu-0.15.0/qemugl-fix.patch b/meta/recipes-devtools/qemu/qemu-0.15.1/qemugl-fix.patch
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-0.15.0/qemugl-fix.patch
rename to meta/recipes-devtools/qemu/qemu-0.15.1/qemugl-fix.patch
diff --git a/meta/recipes-devtools/qemu/qemu_0.15.0.bb b/meta/recipes-devtools/qemu/qemu_0.15.1.bb
similarity index 88%
rename from meta/recipes-devtools/qemu/qemu_0.15.0.bb
rename to meta/recipes-devtools/qemu/qemu_0.15.1.bb
index e2e1340..7eea924 100644
--- a/meta/recipes-devtools/qemu/qemu_0.15.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_0.15.1.bb
@@ -3,8 +3,6 @@ require qemu.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
-PR = "r1"
-
FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
FILESDIR = "${WORKDIR}"
@@ -39,7 +37,7 @@ SRC_URI_append_virtclass-nativesdk = "\
${QEMUGLPATCHES} \
file://glflags.patch \
"
-SRC_URI[md5sum] = "dbc55b014bcd21b98e347f6a90f7fb6d"
-SRC_URI[sha256sum] = "0197e52dba07aeb6dfe0343b0c2ae08ed374d2cb0af3bb9ec73fed5baa0cb74d"
+SRC_URI[md5sum] = "34f17737baaf1b3495c89cd6d4a607ed"
+SRC_URI[sha256sum] = "7705b14d9b8e4df4a0b1790980e618084261e8daef0672a1aa7a830a0f3db5ba"
S = "${WORKDIR}/qemu-${PV}"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 25/26] task-core-nfs: Add nfs-utils-client to RDEPENDS
2011-12-11 22:47 [CONSOLIDATED PULL 00/26] Round up of patches and pull Saul Wold
` (23 preceding siblings ...)
2011-12-11 22:47 ` [CONSOLIDATED PULL 24/26] qemu-0.15.1: Bump recipes from 0.15.0 to 0.15.1 Saul Wold
@ 2011-12-11 22:47 ` Saul Wold
2011-12-11 22:47 ` [CONSOLIDATED PULL 26/26] eglibc: Generate cross testing script during install Saul Wold
2011-12-12 21:52 ` [CONSOLIDATED PULL 00/26] Round up of patches and pull Richard Purdie
26 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2011-12-11 22:47 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
include nfs client in tast-core-nfs as well
this is handy when we need it on target e.g.
testing eglibc needs it and we can just do
EXTRA_IMAGE_FEATURES += "nfs-server"
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-core/tasks/task-core-nfs.bb | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/tasks/task-core-nfs.bb b/meta/recipes-core/tasks/task-core-nfs.bb
index 5859fad..5c7f455 100644
--- a/meta/recipes-core/tasks/task-core-nfs.bb
+++ b/meta/recipes-core/tasks/task-core-nfs.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "NFS tasks for Poky"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r0"
+PR = "r1"
PACKAGES = "\
task-core-nfs-server \
@@ -17,7 +17,9 @@ PACKAGES = "\
ALLOW_EMPTY = "1"
RDEPENDS_task-core-nfs-server = "\
- nfs-utils"
+ nfs-utils \
+ nfs-utils-client \
+ "
# rpcinfo can be useful but only with glibc images
GLIBC_DEPENDENCIES = "glibc-utils"
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* [CONSOLIDATED PULL 26/26] eglibc: Generate cross testing script during install
2011-12-11 22:47 [CONSOLIDATED PULL 00/26] Round up of patches and pull Saul Wold
` (24 preceding siblings ...)
2011-12-11 22:47 ` [CONSOLIDATED PULL 25/26] task-core-nfs: Add nfs-utils-client to RDEPENDS Saul Wold
@ 2011-12-11 22:47 ` Saul Wold
2011-12-12 21:52 ` [CONSOLIDATED PULL 00/26] Round up of patches and pull Richard Purdie
26 siblings, 0 replies; 28+ messages in thread
From: Saul Wold @ 2011-12-11 22:47 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
EGLIBC has long had cross testing capability, so use
that there are few steps needed on setting up the target
as well as the build host. This patch tries to generate
a script with all the needed environment on build host system
To use this script one needs to setup the target as described
in the testing intructions of eglibc and then this script
can directly interface to the target and run the tests from
eglibc's build directory. To run this script
bash <script> username@testing_hostname/ip
The output can be dumped into a log file for later viewing
and checked for "Error " to see the failed tests
Removes INC_PR its not used anywhere
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-core/eglibc/eglibc-common.inc | 1 -
meta/recipes-core/eglibc/eglibc-testing.inc | 47 +++++++++++++++++++++++++++
meta/recipes-core/eglibc/eglibc.inc | 1 +
meta/recipes-core/eglibc/eglibc_2.13.bb | 11 +++---
meta/recipes-core/eglibc/eglibc_2.14.bb | 10 +++--
5 files changed, 60 insertions(+), 10 deletions(-)
create mode 100644 meta/recipes-core/eglibc/eglibc-testing.inc
diff --git a/meta/recipes-core/eglibc/eglibc-common.inc b/meta/recipes-core/eglibc/eglibc-common.inc
index 4fa6488..d18786a 100644
--- a/meta/recipes-core/eglibc/eglibc-common.inc
+++ b/meta/recipes-core/eglibc/eglibc-common.inc
@@ -3,7 +3,6 @@ DESCRIPTION = "Embedded GLIBC (EGLIBC) is a variant of the GNU C Library (GLIBC)
HOMEPAGE = "http://www.eglibc.org/home"
SECTION = "libs"
LICENSE = "GPLv2 & LGPLv2.1"
-INC_PR = "r11"
LIC_FILES_CHKSUM ?= "file://LICENSES;md5=07a394b26e0902b9ffdec03765209770 \
file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \
diff --git a/meta/recipes-core/eglibc/eglibc-testing.inc b/meta/recipes-core/eglibc/eglibc-testing.inc
new file mode 100644
index 0000000..fb632ba
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-testing.inc
@@ -0,0 +1,47 @@
+do_compile_append () {
+ # now generate script to drive testing
+ echo "#!/usr/bin/env sh" >${B}/${HOST_PREFIX}testeglibc
+ set >> ${B}/${HOST_PREFIX}testeglibc
+ # prune out the unneeded vars
+ sed -i -e "/^BASH/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^USER/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^OPT/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^DIRSTACK/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^EUID/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^FUNCNAME/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^GROUPS/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^HOST/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^HOME/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^IFS/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^LC_ALL/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^LOGNAME/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^MACHTYPE/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^OSTYPE/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^PIPE/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^SHELL/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^'/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^UID/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^TERM/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^PATCH_GET/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^PKG_/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^POSIXLY_/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^PPID/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^PS4/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^Q/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^SHLVL/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^STAGING/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^LD_LIBRARY_PATH/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^PSEUDO/d" ${B}/${HOST_PREFIX}testeglibc
+ # append execution part script
+cat >> ${B}/${HOST_PREFIX}testeglibc << STOP
+target="\$1"
+if [ "x\$target" = "x" ]
+then
+ echo "Please specify the target machine and remote user in for of user@target"
+ exit 1;
+fi
+wrapper="${S}/scripts/cross-test-ssh.sh \$target"
+localedef="${STAGING_BINDIR_NATIVE}/cross-localedef --little-endian --uint32-align=4"
+make cross-localedef="\$localedef" cross-test-wrapper="\$wrapper" -k check
+STOP
+}
diff --git a/meta/recipes-core/eglibc/eglibc.inc b/meta/recipes-core/eglibc/eglibc.inc
index 272fcb6..64694a0 100644
--- a/meta/recipes-core/eglibc/eglibc.inc
+++ b/meta/recipes-core/eglibc/eglibc.inc
@@ -1,5 +1,6 @@
require eglibc-common.inc
require eglibc-ld.inc
+require eglibc-testing.inc
STAGINGCC = "gcc-cross-intermediate"
STAGINGCC_virtclass-nativesdk = "gcc-crosssdk-intermediate"
diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb
index 955c4ec..9d3ec85 100644
--- a/meta/recipes-core/eglibc/eglibc_2.13.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.13.bb
@@ -3,7 +3,7 @@ require eglibc.inc
SRCREV = "15508"
DEPENDS += "gperf-native"
-PR = "r18"
+PR = "r19"
PR_append = "+svnr${SRCPV}"
EGLIBC_BRANCH="eglibc-2_13"
@@ -207,10 +207,11 @@ do_compile () {
done
)
echo "Adjust ldd script"
- [ -z "${RTLDLIST}" ] && return
- sed -i ${B}/elf/ldd -e 's#^\(RTLDLIST=\)"\(.*\)"$#\1\2#'
- sed -i ${B}/elf/ldd -e 's#^\(RTLDLIST=\)\(.*\)$#\1"${RTLDLIST} \2"#'
-
+ if [ -n "${RTLDLIST}" ]
+ then
+ sed -i ${B}/elf/ldd -e 's#^\(RTLDLIST=\)"\(.*\)"$#\1\2#'
+ sed -i ${B}/elf/ldd -e 's#^\(RTLDLIST=\)\(.*\)$#\1"${RTLDLIST} \2"#'
+ fi
}
require eglibc-package.inc
diff --git a/meta/recipes-core/eglibc/eglibc_2.14.bb b/meta/recipes-core/eglibc/eglibc_2.14.bb
index fd384f4..8553106 100644
--- a/meta/recipes-core/eglibc/eglibc_2.14.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.14.bb
@@ -3,7 +3,7 @@ require eglibc.inc
SRCREV = "15870"
DEPENDS += "gperf-native"
-PR = "r1"
+PR = "r2"
PR_append = "+svnr${SRCPV}"
EGLIBC_BRANCH="eglibc-2_14"
@@ -209,9 +209,11 @@ do_compile () {
done
)
echo "Adjust ldd script"
- [ -z "${RTLDLIST}" ] && return
- sed -i ${B}/elf/ldd -e 's#^\(RTLDLIST=\)"\(.*\)"$#\1\2#'
- sed -i ${B}/elf/ldd -e 's#^\(RTLDLIST=\)\(.*\)$#\1"${RTLDLIST} \2"#'
+ if [ -n "${RTLDLIST}" ]
+ then
+ sed -i ${B}/elf/ldd -e 's#^\(RTLDLIST=\)"\(.*\)"$#\1\2#'
+ sed -i ${B}/elf/ldd -e 's#^\(RTLDLIST=\)\(.*\)$#\1"${RTLDLIST} \2"#'
+ fi
}
--
1.7.6.4
^ permalink raw reply related [flat|nested] 28+ messages in thread* Re: [CONSOLIDATED PULL 00/26] Round up of patches and pull
2011-12-11 22:47 [CONSOLIDATED PULL 00/26] Round up of patches and pull Saul Wold
` (25 preceding siblings ...)
2011-12-11 22:47 ` [CONSOLIDATED PULL 26/26] eglibc: Generate cross testing script during install Saul Wold
@ 2011-12-12 21:52 ` Richard Purdie
26 siblings, 0 replies; 28+ messages in thread
From: Richard Purdie @ 2011-12-12 21:52 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Sun, 2011-12-11 at 14:47 -0800, Saul Wold wrote:
> Richard,
>
> This is a round of of patches and pulls from last week, built
> locally and on AB.
>
> Includes Nitin's X32 changes along with fixes noticed while doing
> self-hosted work (address comments from Paul earlier).
>
> Sau!
>
>
> The following changes since commit 07f94fa1d661d38b775ce2d99b84e5610c369392:
>
> license/copyleft: exception for ast parse (2011-12-10 00:17:25 +0000)
>
> are available in the git repository at:
> git://git.openembedded.org/openembedded-core-contrib sgw/stage
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
>
> Christopher Larson (1):
> lzop-1.03: add recipe
>
> Elizabeth Flanagan (1):
> license: PR bump failure
>
> Frans Meulenbroeks (1):
> u-boot: renamed dir from uboot to the more appropriate u-boot
>
> H.J. Lu (3):
> mesa: Properly create share library for x32
> siteinfo: create a new siteinfo for x32-linux
> openssl-1.0.0e: Update x32 Configure
>
> Khem Raj (3):
> qemu-0.15.1: Bump recipes from 0.15.0 to 0.15.1
> task-core-nfs: Add nfs-utils-client to RDEPENDS
> eglibc: Generate cross testing script during install
>
> Nitin A Kamble (8):
> gst-fluendo.inc: remove unneccessary hack
> mdadm: Make custom CC definition conditional
> pulseaudio: fix compilation with x32 toolchain
> libacpi: Fix libdir for x32
> findutils: Fix compilation for x32 toolchain
> pax: fix compilation with x32 toolchain
> libacpi: Use the cross strip instead of host strip
> x86 tune: fix TUNE_PKGARCH definition for proper PACKAGE_ARCH
>
> Otavio Salvador (2):
> dosfstools: update native to 2.11
> scripts/send-pull-request: fix typo
>
> Saul Wold (7):
> ncurses: libcurses.so should link to libncurses.so
> bitbake.conf: remove texinfo-native from ASSUME_PROVIDED
> texinfo: fix compile failure due target makedoc binary being used
> task-self-hosted: Reorder by Alpha
> task-self-hosted: Added perl-pod (slight reorder)
> task-self-hosted: Add host-tools task
> task-self-hosted: Move tools to host-tools task
Thanks Saul, these look good. I took all except the uboot one which
needs careful timing, I'll merge that tomorrow morning my time when
maintainers likely to be affected are likely awake.
Cheers,
Richard
^ permalink raw reply [flat|nested] 28+ messages in thread