* [CONSOLIDATED PULL 00/35] Catching up with Pulls
@ 2012-02-07 22:45 Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 01/35] tune-mips32.inc: Add mips32-nf and mips32el-nf Saul Wold
` (35 more replies)
0 siblings, 36 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
Richard et al:
Updates from various folks, this include kernel, uclibc.
One Major change to note is Khem's task-core-tools breakup and
the renaming of POKY_ -> CORE_IMAGE_. This will require layers
to pay attention and fix.
Sau!
The following changes since commit 18d9fcfc4bc4b01f73e89f3b988c9d3d543c7705:
libzypp: add missing runtime dependences on gzip and gnupg (2012-02-03 17:23:28 +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
Andreas Oberritter (1):
tune-mips32.inc: Add mips32-nf and mips32el-nf
Bruce Ashfield (5):
linux-yocto: locate and use out of tree features specified on the
SRC_URI
linux-yocto: meta updates for sys940x and cleanup
linux-yocto: rt compiliation fix
kern-tools: remove explicit 'yocto' references from auto-bsp handling
linux-yocto: fri2: use emgd-1.10
Chase Maupin (1):
u-boot inc: update inc file for newer u-boot versions
Darren Hart (1):
bootimg: Use the same OS files for each boot method
Khem Raj (13):
xorg-apps: Bump PR to accomodate meta-oe recipe deletion
task-core-tools: Divide it into 3 recipes
Enable options needed for ltp to compile
runqemu-internal: qemuarm can handle 256M
gconf,consolekit: Avoid polkit when compiling with uclibc
python: Fix build failure of python-elementtree on x86_64
libdrm: Fix build failure unearthed by uclibc
libx11: Backport _XGetRequest API
pseudo: Wrap renameat and opendir
uclibc: Upgrade recipes from 0.9.32 -> 0.9.33
classes,recipes: Replace POKY_* with CORE_IMAGE_*
gcc-cross-testing: Fix evaluation of user and target name
mirrors.bbclass: Add yp.org and oe.org to fallback mirrors
Mike Crowe (3):
libusb1: Cope with ${libdir} and ${base_libdir} being the same
libusb-compat: Cope with ${libdir} and ${base_libdir} being the same
libcap: Cope with ${libdir} and ${base_libdir} being the same
Otavio Salvador (2):
udev: stop providing cache support by default
dhcp: move dhcp leases files handling to postinst/postrm
Peter Tworek (3):
busybox: Add flock utility to default configuration.
webkit-gtk: Fix error.html resource path.
webkit-gtk: Make webgl support configurable via DISTRO_FEATURES.
Saul Wold (3):
gnupg-1.4.7: Update Patch Info
openssl-0.9.8: Remove in favor or 1.0.0
mtools-3.9.9: Use correct URI for the mirror
Wade Farnsworth (3):
systemtap: bump SRCREV to grab version 1.7
systemtap: extend the recipe to build the native package
systemtap: build and install uprobes.ko
meta/classes/bootimg.bbclass | 31 +-
meta/classes/core-image.bbclass | 8 +-
meta/classes/grub-efi.bbclass | 28 +-
meta/classes/kernel-yocto.bbclass | 21 +
meta/classes/mirrors.bbclass | 21 +-
meta/classes/syslinux.bbclass | 34 +-
.../conf/distro/include/distro_tracking_fields.inc | 26 +-
meta/conf/distro/include/tcmode-default.inc | 2 +-
meta/conf/machine/include/tune-mips32.inc | 6 +-
meta/conf/multilib.conf | 4 +-
meta/recipes-bsp/u-boot/u-boot.inc | 35 +-
meta/recipes-connectivity/dhcp/dhcp.inc | 25 +-
meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb | 2 +-
.../openssl/openssl-0.9.8t/configure-targets.patch | 25 -
.../openssl/openssl-0.9.8t/debian/ca.patch | 22 -
.../openssl-0.9.8t/debian/config-hurd.patch | 17 -
.../openssl-0.9.8t/debian/debian-targets.patch | 56 --
.../openssl-0.9.8t/debian/engines-path.patch | 49 --
.../openssl-0.9.8t/debian/kfreebsd-pipe.patch | 15 -
.../openssl-0.9.8t/debian/make-targets.patch | 15 -
.../openssl/openssl-0.9.8t/debian/man-dir.patch | 15 -
.../openssl-0.9.8t/debian/man-section.patch | 34 -
.../openssl/openssl-0.9.8t/debian/no-rpath.patch | 15 -
.../openssl-0.9.8t/debian/no-symbolic.patch | 15 -
.../openssl/openssl-0.9.8t/debian/perl-path.diff | 762 --------------------
.../openssl/openssl-0.9.8t/debian/pic.patch | 303 --------
.../openssl/openssl-0.9.8t/debian/pkg-config.patch | 36 -
.../openssl/openssl-0.9.8t/debian/rc4-amd64.patch | 16 -
.../openssl/openssl-0.9.8t/debian/rehash-crt.patch | 35 -
.../openssl/openssl-0.9.8t/debian/rehash_pod.patch | 62 --
.../openssl/openssl-0.9.8t/debian/series | 20 -
.../openssl-0.9.8t/debian/shared-lib-ext.patch | 16 -
.../openssl/openssl-0.9.8t/debian/stddef.patch | 14 -
.../openssl-0.9.8t/debian/version-script.patch | 35 -
.../openssl/openssl-0.9.8t/parallel-make-fix.patch | 20 -
.../openssl/openssl-0.9.8t/shared-libs.patch | 50 --
.../recipes-connectivity/openssl/openssl_0.9.8t.bb | 31 -
meta/recipes-core/busybox/busybox-1.19.3/defconfig | 2 +-
meta/recipes-core/images/core-image-minimal.bb | 2 +-
meta/recipes-core/images/self-hosted-image.bb | 2 +-
meta/recipes-core/tasks/task-core-tools-debug.bb | 26 +
...sk-core-tools.bb => task-core-tools-profile.bb} | 81 +--
.../recipes-core/tasks/task-core-tools-testapps.bb | 46 ++
...rch-Free-UCLIBC_HAS_FPU-setting-from-depe.patch | 29 -
...fd.h-SFD_NONBLOCK-for-mips-is-0200-unlike.patch | 33 -
.../uclibc-0.9.32/detect-bx-availibility.patch | 75 --
.../uclibc/uclibc-0.9.32/epoll-asm-fix.patch | 25 -
.../uclibc/uclibc-0.9.32/include-arm-asm.h.patch | 65 --
.../uclibc/uclibc-0.9.32/mount.h-update.patch | 85 ---
.../uclibc-0.9.32/remove-eabi-oabi-selection.patch | 91 ---
.../uclibc-0.9.32/remove-sub-arch-variants.patch | 215 ------
.../uclibc/uclibc-0.9.32/rtld_no.patch | 215 ------
.../uclibc/uclibc-0.9.32/select-force-thumb.patch | 172 -----
.../uclibc/uclibc-0.9.32/sync_file_range2.patch | 47 --
.../uclibc-0.9.32/transform-eabi-oabi-choice.patch | 71 --
.../uclibc-0.9.32/uclibc-arm-ftruncate64.patch | 13 -
.../uclibc-0.9.32/uclibc_scheduler_update.patch | 455 ------------
...rr-and-pass-it-to-INTERNAL_SYSCALL_NCS-so.patch | 32 +
...fstat-Use-64bit-version-of-syscall-if-ava.patch | 177 +++++
.../argp-headers.patch | 2 +
.../argp-support.patch | 3 +
.../compile-arm-fork-with-O2.patch | 2 +-
.../uclibc-0.9.33/define-MSG_CMSG_CLOEXEC.patch | 25 +
meta/recipes-core/uclibc/uclibc-0.9.33/dup3.patch | 37 +
...so_use_arm_dl_linux_resolve_in_thumb_mode.patch | 6 +
.../libc_symbols_include_bits_uclibc_config.patch | 19 +
.../mips/uClibc.machine | 0
.../orign_path.patch | 94 ++--
.../powerpc_copysignl.patch | 6 +
.../remove_attribute_optimize_Os.patch | 17 +-
.../{uclibc-0.9.32 => uclibc-0.9.33}/uClibc.distro | 8 +-
.../uClibc.machine | 0
.../uclibc-execvpe.patch | 3 +
.../uclibc_enable_log2_test.patch | 5 +
meta/recipes-core/uclibc/uclibc-git/uClibc.distro | 5 +
...-initial_0.9.32.bb => uclibc-initial_0.9.33.bb} | 0
.../uclibc/{uclibc_0.9.32.bb => uclibc_0.9.33.bb} | 26 +-
meta/recipes-core/udev/udev.inc | 2 +-
meta/recipes-core/udev/udev_164.bb | 2 +-
meta/recipes-devtools/gcc/gcc-cross.inc | 6 +-
meta/recipes-devtools/mtools/mtools_3.9.9.bb | 4 +-
meta/recipes-devtools/pseudo/pseudo/opendir.patch | 94 +++
meta/recipes-devtools/pseudo/pseudo/renameat.patch | 229 ++++++
meta/recipes-devtools/pseudo/pseudo_1.2.bb | 6 +-
.../python/python/host_include_contamination.patch | 27 +
meta/recipes-devtools/python/python_2.7.2.bb | 3 +-
meta/recipes-extended/images/core-image-basic.bb | 2 +-
meta/recipes-extended/images/core-image-lsb-dev.bb | 2 +-
meta/recipes-extended/images/core-image-lsb-sdk.bb | 2 +-
meta/recipes-extended/images/core-image-lsb.bb | 2 +-
meta/recipes-gnome/gnome/gconf_3.2.3.bb | 9 +-
.../drm/libdrm/GNU_SOURCE_definition.patch | 30 +
meta/recipes-graphics/drm/libdrm_2.4.30.bb | 6 +-
meta/recipes-graphics/images/core-image-clutter.bb | 2 +-
.../images/core-image-gtk-directfb.bb | 2 +-
meta/recipes-graphics/xorg-app/xorg-app-common.inc | 2 +-
...quest-as-substitute-for-GetReq-GetReqExtr.patch | 137 ++++
meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb | 3 +
.../kern-tools/kern-tools-native_git.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto_3.0.bb | 2 +-
.../systemtap/systemtap-uprobes_git.bb | 42 ++
meta/recipes-kernel/systemtap/systemtap_git.bb | 22 +-
meta/recipes-kernel/systemtap/systemtap_git.inc | 16 +
meta/recipes-qt/images/qt4e-demo-image.bb | 2 +-
meta/recipes-sato/webkit/webkit-gtk_svn.bb | 6 +-
.../recipes-support/consolekit/consolekit_0.4.5.bb | 11 +-
.../gnupg/gnupg-1.4.7/long-long-thumb.patch | 7 +
.../gnupg/gnupg-1.4.7/mips_gcc4.4.patch | 8 +
meta/recipes-support/libcap/libcap.inc | 8 +-
meta/recipes-support/libusb/libusb-compat_0.1.3.bb | 6 +-
meta/recipes-support/libusb/libusb1_1.0.8.bb | 6 +-
scripts/runqemu-internal | 13 +-
113 files changed, 1333 insertions(+), 3530 deletions(-)
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/configure-targets.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/ca.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/config-hurd.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/debian-targets.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/engines-path.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/kfreebsd-pipe.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/make-targets.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/man-dir.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/man-section.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/no-rpath.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/no-symbolic.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/perl-path.diff
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/pic.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/pkg-config.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rc4-amd64.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rehash-crt.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rehash_pod.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/series
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/shared-lib-ext.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/stddef.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/version-script.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/parallel-make-fix.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/shared-libs.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl_0.9.8t.bb
create mode 100644 meta/recipes-core/tasks/task-core-tools-debug.bb
rename meta/recipes-core/tasks/{task-core-tools.bb => task-core-tools-profile.bb} (48%)
create mode 100644 meta/recipes-core/tasks/task-core-tools-testapps.bb
delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.32/0001-Config.in.arch-Free-UCLIBC_HAS_FPU-setting-from-depe.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.32/0001-mips-signalfd.h-SFD_NONBLOCK-for-mips-is-0200-unlike.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.32/detect-bx-availibility.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.32/epoll-asm-fix.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.32/include-arm-asm.h.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.32/mount.h-update.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.32/remove-eabi-oabi-selection.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.32/remove-sub-arch-variants.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.32/rtld_no.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.32/select-force-thumb.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.32/sync_file_range2.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.32/transform-eabi-oabi-choice.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.32/uclibc-arm-ftruncate64.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.32/uclibc_scheduler_update.patch
create mode 100644 meta/recipes-core/uclibc/uclibc-0.9.33/0001-Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS-so.patch
create mode 100644 meta/recipes-core/uclibc/uclibc-0.9.33/0001-lstat-stat-fstat-Use-64bit-version-of-syscall-if-ava.patch
rename meta/recipes-core/uclibc/{uclibc-0.9.32 => uclibc-0.9.33}/argp-headers.patch (99%)
rename meta/recipes-core/uclibc/{uclibc-0.9.32 => uclibc-0.9.33}/argp-support.patch (99%)
rename meta/recipes-core/uclibc/{uclibc-0.9.32 => uclibc-0.9.33}/compile-arm-fork-with-O2.patch (97%)
create mode 100644 meta/recipes-core/uclibc/uclibc-0.9.33/define-MSG_CMSG_CLOEXEC.patch
create mode 100644 meta/recipes-core/uclibc/uclibc-0.9.33/dup3.patch
rename meta/recipes-core/uclibc/{uclibc-0.9.32 => uclibc-0.9.33}/ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch (86%)
create mode 100644 meta/recipes-core/uclibc/uclibc-0.9.33/libc_symbols_include_bits_uclibc_config.patch
rename meta/recipes-core/uclibc/{uclibc-0.9.32 => uclibc-0.9.33}/mips/uClibc.machine (100%)
rename meta/recipes-core/uclibc/{uclibc-0.9.32 => uclibc-0.9.33}/orign_path.patch (64%)
rename meta/recipes-core/uclibc/{uclibc-0.9.32 => uclibc-0.9.33}/powerpc_copysignl.patch (96%)
rename meta/recipes-core/uclibc/{uclibc-0.9.32 => uclibc-0.9.33}/remove_attribute_optimize_Os.patch (93%)
rename meta/recipes-core/uclibc/{uclibc-0.9.32 => uclibc-0.9.33}/uClibc.distro (96%)
rename meta/recipes-core/uclibc/{uclibc-0.9.32 => uclibc-0.9.33}/uClibc.machine (100%)
rename meta/recipes-core/uclibc/{uclibc-0.9.32 => uclibc-0.9.33}/uclibc-execvpe.patch (99%)
rename meta/recipes-core/uclibc/{uclibc-0.9.32 => uclibc-0.9.33}/uclibc_enable_log2_test.patch (81%)
rename meta/recipes-core/uclibc/{uclibc-initial_0.9.32.bb => uclibc-initial_0.9.33.bb} (100%)
rename meta/recipes-core/uclibc/{uclibc_0.9.32.bb => uclibc_0.9.33.bb} (45%)
create mode 100644 meta/recipes-devtools/pseudo/pseudo/opendir.patch
create mode 100644 meta/recipes-devtools/pseudo/pseudo/renameat.patch
create mode 100644 meta/recipes-devtools/python/python/host_include_contamination.patch
create mode 100644 meta/recipes-graphics/drm/libdrm/GNU_SOURCE_definition.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.4.4/0001-Add-_XGetRequest-as-substitute-for-GetReq-GetReqExtr.patch
create mode 100644 meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
create mode 100644 meta/recipes-kernel/systemtap/systemtap_git.inc
--
1.7.6.5
^ permalink raw reply [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 01/35] tune-mips32.inc: Add mips32-nf and mips32el-nf
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 02/35] bootimg: Use the same OS files for each boot method Saul Wold
` (34 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Andreas Oberritter <obi@opendreambox.org>
tune-mips32.inc only lists mips32 CPUs with hardware FPU.
Extend it to list CPUs without hardware FPU, too.
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
meta/conf/machine/include/tune-mips32.inc | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/meta/conf/machine/include/tune-mips32.inc b/meta/conf/machine/include/tune-mips32.inc
index 4a5f0fa..45d865e 100644
--- a/meta/conf/machine/include/tune-mips32.inc
+++ b/meta/conf/machine/include/tune-mips32.inc
@@ -6,9 +6,13 @@ TUNEVALID[mips32] = "Enable mips32 specific processor optimizations"
TUNE_CONFLICTS[mips32] = "n64 n32"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "mips32", "-march=mips32", "", d)}"
-AVAILTUNES += "mips32 mips32el"
+AVAILTUNES += "mips32 mips32el mips32-nf mips32el-nf"
TUNE_FEATURES_tune-mips32 = "${TUNE_FEATURES_tune-mips} mips32"
PACKAGE_EXTRA_ARCHS_tune-mips32 = "mips"
TUNE_FEATURES_tune-mips32el = "${TUNE_FEATURES_tune-mipsel} mips32"
PACKAGE_EXTRA_ARCHS_tune-mips32el = "mipsel"
+TUNE_FEATURES_tune-mips32-nf = "${TUNE_FEATURES_tune-mips-nf} mips32"
+PACKAGE_EXTRA_ARCHS_tune-mips32-nf = "mips-nf"
+TUNE_FEATURES_tune-mips32el-nf = "${TUNE_FEATURES_tune-mipsel-nf} mips32"
+PACKAGE_EXTRA_ARCHS_tune-mips32el-nf = "mipsel-nf"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 02/35] bootimg: Use the same OS files for each boot method
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 01/35] tune-mips32.inc: Add mips32-nf and mips32el-nf Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 03/35] busybox: Add flock utility to default configuration Saul Wold
` (33 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Darren Hart <dvhart@linux.intel.com>
Fixes [YOCTO #1951]
The do_bootimg code can generate hybrid efi+pcbios images (syslinux and
grub-efi) to boot on platforms with both EFI and legacy BIOS options. The
current implementation copies the kernel, initrd, and rootfs twice,
unnecessarily bloating the image size. This is an especially egregious bug
on -sato images.
Update the classes to use a common install of the kernel, initrd, and rootfs to
the root of the boot media. Grub-efi, syslinux, and isolinux can all reference
this location explicitly with a leading slash.
Tested with an EFI+PCBIOS image in both EFI and PCBIOS boot modes on two
platforms. No ISO image testing was performed.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
meta/classes/bootimg.bbclass | 31 ++++++++++++++++++++++++-------
meta/classes/grub-efi.bbclass | 28 +++++++++-------------------
meta/classes/syslinux.bbclass | 34 +++++++++++++---------------------
3 files changed, 46 insertions(+), 47 deletions(-)
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index a717600..1d1a3d0 100644
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -8,13 +8,13 @@
# End result is two things:
#
# 1. A .hddimg file which is an msdos filesystem containing syslinux, a kernel,
-# an initrd and a rootfs image. These can be written to harddisks directly and
+# an initrd and a rootfs image. These can be written to harddisks directly and
# also booted on USB flash disks (write them there with dd).
#
# 2. A CD .iso image
-# Boot process is that the initrd will boot and process which label was selected
-# in syslinux. Actions based on the label are then performed (e.g. installing to
+# Boot process is that the initrd will boot and process which label was selected
+# in syslinux. Actions based on the label are then performed (e.g. installing to
# an hdd)
# External variables (also used by syslinux.bbclass)
@@ -29,8 +29,8 @@ do_bootimg[depends] += "dosfstools-native:do_populate_sysroot \
PACKAGES = " "
EXCLUDE_FROM_WORLD = "1"
-HDDDIR = "${S}/hdd/boot"
-ISODIR = "${S}/cd"
+HDDDIR = "${S}/hddimg"
+ISODIR = "${S}/iso"
BOOTIMG_VOLUME_ID ?= "boot"
BOOTIMG_EXTRA_SPACE ?= "512"
@@ -58,6 +58,22 @@ PCBIOS_CLASS = ${@pcbios_class(d)}
inherit ${PCBIOS_CLASS}
inherit ${EFI_CLASS}
+populate() {
+ DEST=$1
+ install -d ${DEST}
+
+ # Install bzImage, initrd, and rootfs.img in DEST for all loaders to use.
+ install -m 0644 ${STAGING_DIR_HOST}/kernel/bzImage ${DEST}/vmlinuz
+
+ if [ -n "${INITRD}" ] && [ -s "${INITRD}" ]; then
+ install -m 0644 ${INITRD} ${DEST}/initrd
+ fi
+
+ if [ -n "${ROOTFS}" ] && [ -s "${ROOTFS}" ]; then
+ install -m 0644 ${ROOTFS} ${DEST}/rootfs.img
+ fi
+
+}
build_iso() {
# Only create an ISO if we have an INITRD and NOISO was not set
@@ -66,7 +82,7 @@ build_iso() {
return
fi
- install -d ${ISODIR}
+ populate ${ISODIR}
if [ "${PCBIOS}" = "1" ]; then
syslinux_iso_populate
@@ -95,7 +111,8 @@ build_iso() {
build_hddimg() {
# Create an HDD image
if [ "${NOHDD}" != "1" ] ; then
- install -d ${HDDDIR}
+ populate ${HDDDIR}
+
if [ "${PCBIOS}" = "1" ]; then
syslinux_hddimg_populate
fi
diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass
index 762322b..1efb43b 100644
--- a/meta/classes/grub-efi.bbclass
+++ b/meta/classes/grub-efi.bbclass
@@ -22,39 +22,29 @@ GRUB_TIMEOUT ?= "10"
GRUB_OPTS ?= "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1"
EFIDIR = "/EFI/BOOT"
-GRUB_HDDDIR = "${HDDDIR}${EFIDIR}"
-GRUB_ISODIR = "${ISODIR}${EFIDIR}"
grubefi_populate() {
+ # DEST must be the root of the image so that EFIDIR is not
+ # nested under a top level directory.
DEST=$1
- install -d ${DEST}
-
- install -m 0644 ${STAGING_DIR_HOST}/kernel/bzImage ${DEST}/vmlinuz
-
- if [ -n "${INITRD}" ] && [ -s "${INITRD}" ]; then
- install -m 0644 ${INITRD} ${DEST}/initrd
- fi
-
- if [ -n "${ROOTFS}" ] && [ -s "${ROOTFS}" ]; then
- install -m 0644 ${ROOTFS} ${DEST}/rootfs.img
- fi
+ install -d ${DEST}${EFIDIR}
GRUB_IMAGE="bootia32.efi"
if [ "${TARGET_ARCH}" = "x86_64" ]; then
GRUB_IMAGE="bootx64.efi"
fi
- install -m 0644 ${DEPLOY_DIR_IMAGE}/${GRUB_IMAGE} ${DEST}
+ install -m 0644 ${DEPLOY_DIR_IMAGE}/${GRUB_IMAGE} ${DEST}${EFIDIR}
- install -m 0644 ${GRUBCFG} ${DEST}
+ install -m 0644 ${GRUBCFG} ${DEST}${EFIDIR}
}
grubefi_iso_populate() {
- grubefi_populate ${GRUB_ISODIR}
+ grubefi_populate ${ISODIR}
}
grubefi_hddimg_populate() {
- grubefi_populate ${GRUB_HDDDIR}
+ grubefi_populate ${HDDDIR}
}
python build_grub_cfg() {
@@ -109,7 +99,7 @@ python build_grub_cfg() {
bb.data.update_data(localdata)
cfgfile.write('\nmenuentry \'%s\'{\n' % (label))
- cfgfile.write('linux ${EFIDIR}/vmlinuz LABEL=%s' % (label))
+ cfgfile.write('linux /vmlinuz LABEL=%s' % (label))
append = localdata.getVar('APPEND', True)
initrd = localdata.getVar('INITRD', True)
@@ -119,7 +109,7 @@ python build_grub_cfg() {
cfgfile.write('\n')
if initrd:
- cfgfile.write('initrd ${EFIDIR}/initrd')
+ cfgfile.write('initrd /initrd')
cfgfile.write('\n}\n')
cfgfile.close()
diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass
index 91c4275..1569074 100644
--- a/meta/classes/syslinux.bbclass
+++ b/meta/classes/syslinux.bbclass
@@ -18,42 +18,34 @@ do_bootimg[depends] += "syslinux:do_populate_sysroot \
SYSLINUXCFG = "${S}/syslinux.cfg"
SYSLINUXMENU = "${S}/menu"
-SYSLINUX_ISODIR = "${ISODIR}/isolinux"
-SYSLINUX_HDDDIR = "${HDDDIR}"
+ISOLINUXDIR = "/isolinux"
+SYSLINUXDIR = "/"
ISO_BOOTIMG = "isolinux/isolinux.bin"
ISO_BOOTCAT = "isolinux/boot.cat"
MKISOFS_OPTIONS = "-no-emul-boot -boot-load-size 4 -boot-info-table"
syslinux_populate() {
DEST=$1
- CFGNAME=$2
+ BOOTDIR=$2
+ CFGNAME=$3
- install -d ${DEST}
-
- # Install the kernel, initrd, and rootfs
- install -m 0644 ${STAGING_DIR_HOST}/kernel/bzImage ${DEST}/vmlinuz
- if [ -n "${INITRD}" ] && [ -s "${INITRD}" ]; then
- install -m 0644 ${INITRD} ${DEST}/initrd
- fi
- if [ -n "${ROOTFS}" ] && [ -s "${ROOTFS}" ]; then
- install -m 0644 ${ROOTFS} ${DEST}/rootfs.img
- fi
+ install -d ${DEST}${BOOTDIR}
# Install the config files
- install -m 0644 ${SYSLINUXCFG} ${DEST}/${CFGNAME}
+ install -m 0644 ${SYSLINUXCFG} ${DEST}${BOOTDIR}/${CFGNAME}
if [ -f ${SYSLINUXMENU} ]; then
- install -m 0644 ${SYSLINUXMENU} ${DEST}
+ install -m 0644 ${SYSLINUXMENU} ${DEST}${BOOTDIR}
fi
}
syslinux_iso_populate() {
- syslinux_populate ${SYSLINUX_ISODIR} isolinux.cfg
- install -m 0644 ${STAGING_LIBDIR}/syslinux/isolinux.bin ${SYSLINUX_ISODIR}
+ syslinux_populate ${ISODIR} ${ISOLINUXDIR} isolinux.cfg
+ install -m 0644 ${STAGING_LIBDIR}/syslinux/isolinux.bin ${ISODIR}${ISOLINUXDIR}
}
syslinux_hddimg_populate() {
- syslinux_populate ${SYSLINUX_HDDDIR} syslinux.cfg
- install -m 0444 ${STAGING_LIBDIR}/syslinux/ldlinux.sys ${SYSLINUX_HDDDIR}/ldlinux.sys
+ syslinux_populate ${HDDDIR} ${SYSLINUXDIR} syslinux.cfg
+ install -m 0444 ${STAGING_LIBDIR}/syslinux/ldlinux.sys ${HDDDIR}${SYSLINUXDIR}/ldlinux.sys
}
syslinux_hddimg_install() {
@@ -187,7 +179,7 @@ python build_syslinux_cfg () {
localdata.setVar('OVERRIDES', label + ':' + overrides)
bb.data.update_data(localdata)
- cfgfile.write('LABEL %s\nKERNEL vmlinuz\n' % (label))
+ cfgfile.write('LABEL %s\nKERNEL /vmlinuz\n' % (label))
append = localdata.getVar('APPEND', 1)
initrd = localdata.getVar('INITRD', 1)
@@ -196,7 +188,7 @@ python build_syslinux_cfg () {
cfgfile.write('APPEND ')
if initrd:
- cfgfile.write('initrd=initrd ')
+ cfgfile.write('initrd=/initrd ')
cfgfile.write('LABEL=%s '% (label))
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 03/35] busybox: Add flock utility to default configuration.
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 01/35] tune-mips32.inc: Add mips32-nf and mips32el-nf Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 02/35] bootimg: Use the same OS files for each boot method Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 04/35] gnupg-1.4.7: Update Patch Info Saul Wold
` (32 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Peter Tworek <tworaz666@gmail.com>
Flock is required by by pm-utils package to function properly
(/usr/lib/pm-utils/functions). It's shipped in both busybox and
util-linux. Both versions work fine with pm-utils. Enabling it
in busybox seems like simpliest solution for the problem.
Signed-off-by: Peter Tworek <tworaz666@gmail.com>
---
meta/recipes-core/busybox/busybox-1.19.3/defconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/busybox/busybox-1.19.3/defconfig b/meta/recipes-core/busybox/busybox-1.19.3/defconfig
index b474ad4..fa9c078 100644
--- a/meta/recipes-core/busybox/busybox-1.19.3/defconfig
+++ b/meta/recipes-core/busybox/busybox-1.19.3/defconfig
@@ -540,7 +540,7 @@ CONFIG_FEATURE_FDISK_WRITABLE=y
# CONFIG_FEATURE_GPT_LABEL is not set
# CONFIG_FEATURE_FDISK_ADVANCED is not set
# CONFIG_FINDFS is not set
-# CONFIG_FLOCK is not set
+CONFIG_FLOCK=y
# CONFIG_FREERAMDISK is not set
CONFIG_FSCK_MINIX=y
# CONFIG_MKFS_EXT2 is not set
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 04/35] gnupg-1.4.7: Update Patch Info
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (2 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 03/35] busybox: Add flock utility to default configuration Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 05/35] openssl-0.9.8: Remove in favor or 1.0.0 Saul Wold
` (31 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../gnupg/gnupg-1.4.7/long-long-thumb.patch | 7 +++++++
.../gnupg/gnupg-1.4.7/mips_gcc4.4.patch | 8 ++++++++
2 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-support/gnupg/gnupg-1.4.7/long-long-thumb.patch b/meta/recipes-support/gnupg/gnupg-1.4.7/long-long-thumb.patch
index dd4ec73..2855cab 100644
--- a/meta/recipes-support/gnupg/gnupg-1.4.7/long-long-thumb.patch
+++ b/meta/recipes-support/gnupg/gnupg-1.4.7/long-long-thumb.patch
@@ -1,3 +1,10 @@
+Orignal Patch came from OpenWrt via OE-Classic
+https://dev.openwrt.org/browser/packages/utils/gnupg/patches/001-mips_gcc4.4
+which is no longer a valid revision!
+
+Upstream-Status: Inappropriate [configuration]
+
+
--- gnupg/mpi/longlong.h~ 2006-02-14 10:09:55.000000000 +0000
+++ gnupg/mpi/longlong.h 2008-10-27 13:11:09.000000000 +0000
@@ -181,7 +181,7 @@
diff --git a/meta/recipes-support/gnupg/gnupg-1.4.7/mips_gcc4.4.patch b/meta/recipes-support/gnupg/gnupg-1.4.7/mips_gcc4.4.patch
index b101a5b..9a03b2b 100644
--- a/meta/recipes-support/gnupg/gnupg-1.4.7/mips_gcc4.4.patch
+++ b/meta/recipes-support/gnupg/gnupg-1.4.7/mips_gcc4.4.patch
@@ -1,3 +1,11 @@
+
+From Openembedded-Classic
+
+ gnupg-1.4.10: Readd the ARM Thumb patch as debian has no thumb support
+
+
+Upstream-Status: Inappropriate [embedded-specific]
+
Index: gnupg-1.4.10/mpi/longlong.h
===================================================================
--- gnupg-1.4.10.orig/mpi/longlong.h 2008-12-11 17:39:43.000000000 +0100
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 05/35] openssl-0.9.8: Remove in favor or 1.0.0
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (3 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 04/35] gnupg-1.4.7: Update Patch Info Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 06/35] webkit-gtk: Fix error.html resource path Saul Wold
` (30 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
Now that Openssl 1.0.0 has been out for a while, there is no need to
keep multiple versions.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../openssl/openssl-0.9.8t/configure-targets.patch | 25 -
.../openssl/openssl-0.9.8t/debian/ca.patch | 22 -
.../openssl-0.9.8t/debian/config-hurd.patch | 17 -
.../openssl-0.9.8t/debian/debian-targets.patch | 56 --
.../openssl-0.9.8t/debian/engines-path.patch | 49 --
.../openssl-0.9.8t/debian/kfreebsd-pipe.patch | 15 -
.../openssl-0.9.8t/debian/make-targets.patch | 15 -
.../openssl/openssl-0.9.8t/debian/man-dir.patch | 15 -
.../openssl-0.9.8t/debian/man-section.patch | 34 -
.../openssl/openssl-0.9.8t/debian/no-rpath.patch | 15 -
.../openssl-0.9.8t/debian/no-symbolic.patch | 15 -
.../openssl/openssl-0.9.8t/debian/perl-path.diff | 762 --------------------
.../openssl/openssl-0.9.8t/debian/pic.patch | 303 --------
.../openssl/openssl-0.9.8t/debian/pkg-config.patch | 36 -
.../openssl/openssl-0.9.8t/debian/rc4-amd64.patch | 16 -
.../openssl/openssl-0.9.8t/debian/rehash-crt.patch | 35 -
.../openssl/openssl-0.9.8t/debian/rehash_pod.patch | 62 --
.../openssl/openssl-0.9.8t/debian/series | 20 -
.../openssl-0.9.8t/debian/shared-lib-ext.patch | 16 -
.../openssl/openssl-0.9.8t/debian/stddef.patch | 14 -
.../openssl-0.9.8t/debian/version-script.patch | 35 -
.../openssl/openssl-0.9.8t/parallel-make-fix.patch | 20 -
.../openssl/openssl-0.9.8t/shared-libs.patch | 50 --
.../recipes-connectivity/openssl/openssl_0.9.8t.bb | 31 -
24 files changed, 0 insertions(+), 1678 deletions(-)
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/configure-targets.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/ca.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/config-hurd.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/debian-targets.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/engines-path.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/kfreebsd-pipe.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/make-targets.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/man-dir.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/man-section.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/no-rpath.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/no-symbolic.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/perl-path.diff
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/pic.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/pkg-config.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rc4-amd64.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rehash-crt.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rehash_pod.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/series
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/shared-lib-ext.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/stddef.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/version-script.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/parallel-make-fix.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl-0.9.8t/shared-libs.patch
delete mode 100644 meta/recipes-connectivity/openssl/openssl_0.9.8t.bb
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/configure-targets.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/configure-targets.patch
deleted file mode 100644
index 2317949..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/configure-targets.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-The number of colons are important :)
-
-Index: openssl-0.9.8g/Configure
-===================================================================
---- openssl-0.9.8g.orig/Configure 2008-04-12 04:27:22.000000000 +0200
-+++ openssl-0.9.8g/Configure 2008-04-12 04:38:56.000000000 +0200
-@@ -395,6 +395,16 @@
- "linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${no_asm}",
- "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${no_asm}",
-
-+ # Linux on ARM
-+"linux-elf-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-elf-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-gnueabi-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-gnueabi-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-uclibceabi-arm","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-uclibceabi-armeb","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+
-+"linux-avr32","$ENV{'CC'}:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).",
-+
- #### *BSD [do see comment about ${BSDthreads} above!]
- "BSD-generic32","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
- "BSD-x86", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/ca.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/ca.patch
deleted file mode 100644
index aba4d42..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/ca.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8m/apps/CA.pl.in
-===================================================================
---- openssl-0.9.8m.orig/apps/CA.pl.in 2006-04-28 00:28:51.000000000 +0000
-+++ openssl-0.9.8m/apps/CA.pl.in 2010-02-27 00:36:51.000000000 +0000
-@@ -65,6 +65,7 @@
- foreach (@ARGV) {
- if ( /^(-\?|-h|-help)$/ ) {
- print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
-+ print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
- exit 0;
- } elsif (/^-newcert$/) {
- # create a certificate
-@@ -165,6 +166,7 @@
- } else {
- print STDERR "Unknown arg $_\n";
- print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
-+ print STDERR "usage: CA -signcert certfile keyfile|-newcert|-newreq|-newca|-sign|-verify\n";
- exit 1;
- }
- }
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/config-hurd.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/config-hurd.patch
deleted file mode 100644
index 2359d15..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/config-hurd.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8k/config
-===================================================================
---- openssl-0.9.8k.orig/config 2009-02-16 09:43:41.000000000 +0100
-+++ openssl-0.9.8k/config 2009-07-19 11:32:41.000000000 +0200
-@@ -162,8 +162,8 @@
- echo "${MACHINE}-whatever-linux1"; exit 0
- ;;
-
-- GNU*)
-- echo "hurd-x86"; exit 0;
-+ GNU:*|GNU/*:*)
-+ echo "${MACHINE}-gnuish"; exit 0;
- ;;
-
- LynxOS:*)
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/debian-targets.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/debian-targets.patch
deleted file mode 100644
index 5720988..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/debian-targets.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8k/Configure
-===================================================================
---- openssl-0.9.8k.orig/Configure 2009-12-09 16:09:41.000000000 +0000
-+++ openssl-0.9.8k/Configure 2009-12-09 16:09:55.000000000 +0000
-@@ -320,6 +320,49 @@
- "osf1-alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${no_asm}:dlfcn:alpha-osf1-shared:::.so",
- "tru64-alpha-cc", "cc:-std1 -tune host -fast -readonly_strings::-pthread:::SIXTY_FOUR_BIT_LONG RC4_CHUNK:${no_asm}:dlfcn:alpha-osf1-shared::-msym:.so",
-
-+# Debian GNU/* (various architectures)
-+"debian-alpha","gcc:-DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-alpha-ev4","gcc:-DTERMIO -O3 -Wa,--noexecstack -mcpu=ev4 -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-alpha-ev5","gcc:-DTERMIO -O3 -Wa,--noexecstack -mcpu=ev5 -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_RISC1 DES_UNROLL:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-arm","gcc:-DL_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-armeb","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-armel","gcc:-DL_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+#"debian-amd64","gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-amd64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm_linux}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-avr32", "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG_BF_PTR::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-kfreebsd-amd64","gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+#"debian-freebsd-alpha","gcc:-DTERMIOS -O -Wa,--noexecstack -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-hppa","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-hurd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -mtune=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-ia64","gcc:-DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:${ia64_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+#"debian-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -fomit-frame-pointer -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC",
-+"debian-i386","gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-i386-i486","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i486 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-i386-i586","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i586 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-i386-i686/cmov","gcc:-DL_ENDIAN -DTERMIO -O3 -march=i686 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-m68k","gcc:-DB_ENDIAN -DTERMIO -O2 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_INDEX::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-mips", "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-mipsel", "gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-netbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-netbsd-m68k", "gcc:-DB_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-netbsd-sparc", "gcc:-DB_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -mv8 -Wall::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-openbsd-alpha","gcc:-DTERMIOS -O3 -Wa,--noexecstack -g::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-openbsd-i386", "gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g -m486::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-openbsd-mips","gcc:-O2 -Wa,--noexecstack -g -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC2 DES_PTR BF_PTR:::::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-powerpc","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_UNROLL DES_RISC2 DES_PTR MD2_CHAR RC4_INDEX::linux_ppc32.o::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-ppc64","gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::linux_ppc64.o::::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-s390","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sh3", "gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sh4", "gcc:-DL_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sh3eb", "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sh4eb", "gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-m32r","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sparc","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sparc-v8","gcc:-DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -mcpu=v8 -g -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sparc-v9","gcc:-DB_ENDIAN -DTERMIO -O3 -mcpu=v9 -Wa,--noexecstack -Wa,-Av8plus -g -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::sparcv8plus.o:des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-sparc64","gcc:-m64 -DB_ENDIAN -DTERMIO -O3 -Wa,--noexecstack -g -Wall -DULTRASPARC -DBN_DIV2W::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR:::des_enc-sparc.o fcrypt_b.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+
- ####
- #### Variety of LINUX:-)
- ####
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/engines-path.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/engines-path.patch
deleted file mode 100644
index 5b4c7d5..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/engines-path.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8m/Makefile.org
-===================================================================
---- openssl-0.9.8m.orig/Makefile.org 2010-01-27 16:06:36.000000000 +0000
-+++ openssl-0.9.8m/Makefile.org 2010-02-27 00:43:04.000000000 +0000
-@@ -620,7 +620,7 @@
- install_sw:
- @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
- $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
-- $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
-+ $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines \
- $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \
- $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
- $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
-Index: openssl-0.9.8m/engines/Makefile
-===================================================================
---- openssl-0.9.8m.orig/engines/Makefile 2009-11-10 01:53:02.000000000 +0000
-+++ openssl-0.9.8m/engines/Makefile 2010-02-27 00:45:03.000000000 +0000
-@@ -101,13 +101,13 @@
- *DSO_DL*) sfx="sl";; \
- *) sfx="bad";; \
- esac; \
-- cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \
-+ cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/lib$$l.$$sfx.new; \
- else \
- sfx="so"; \
- cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \
- fi; \
-- chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \
-- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx ); \
-+ chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/lib$$l.$$sfx.new; \
-+ mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx ); \
- done; \
- fi
-
-Index: openssl-0.9.8m/Configure
-===================================================================
---- openssl-0.9.8m.orig/Configure 2010-02-27 00:40:42.000000000 +0000
-+++ openssl-0.9.8m/Configure 2010-02-27 00:46:47.000000000 +0000
-@@ -1738,7 +1738,7 @@
- # $foo is to become "$prefix/lib$multilib/engines";
- # as Makefile.org and engines/Makefile are adapted for
- # $multilib suffix.
-- my $foo = "$prefix/lib/engines";
-+ my $foo = "$prefix/lib/ssl/engines";
- $foo =~ s/\\/\\\\/g;
- print OUT "#define ENGINESDIR \"$foo\"\n";
- }
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/kfreebsd-pipe.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/kfreebsd-pipe.patch
deleted file mode 100644
index b0312f3..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/kfreebsd-pipe.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8k/crypto/perlasm/x86_64-xlate.pl
-===================================================================
---- openssl-0.9.8k.orig/crypto/perlasm/x86_64-xlate.pl 2008-02-13 21:01:48.000000000 +0100
-+++ openssl-0.9.8k/crypto/perlasm/x86_64-xlate.pl 2009-07-19 11:37:23.000000000 +0200
-@@ -62,7 +62,7 @@
- my ($outdev,$outino,@junk)=stat($output);
-
- open STDOUT,">$output" || die "can't open $output: $!"
-- if ($stddev!=$outdev || $stdino!=$outino);
-+# if ($stddev!=$outdev || $stdino!=$outino);
- }
-
- my $masmref=8 + 50727*2**-32; # 8.00.50727 shipped with VS2005
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/make-targets.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/make-targets.patch
deleted file mode 100644
index 91207d8..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/make-targets.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8k/Makefile.org
-===================================================================
---- openssl-0.9.8k.orig/Makefile.org 2009-07-19 11:32:41.000000000 +0200
-+++ openssl-0.9.8k/Makefile.org 2009-07-19 11:37:31.000000000 +0200
-@@ -131,7 +131,7 @@
-
- BASEADDR=
-
--DIRS= crypto fips ssl engines apps test tools
-+DIRS= crypto fips ssl engines apps tools
- SHLIBDIRS= crypto ssl fips
-
- # dirs in crypto to build
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/man-dir.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/man-dir.patch
deleted file mode 100644
index 358f8cd..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/man-dir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8k/Makefile.org
-===================================================================
---- openssl-0.9.8k.orig/Makefile.org 2009-07-19 11:32:41.000000000 +0200
-+++ openssl-0.9.8k/Makefile.org 2009-07-19 11:37:29.000000000 +0200
-@@ -152,7 +152,7 @@
-
- MAKEFILE= Makefile
-
--MANDIR=$(OPENSSLDIR)/man
-+MANDIR=/usr/share/man
- MAN1=1
- MAN3=3
- MANSUFFIX=
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/man-section.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/man-section.patch
deleted file mode 100644
index b74b12e..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/man-section.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8k/Makefile.org
-===================================================================
---- openssl-0.9.8k.orig/Makefile.org 2009-07-19 11:34:06.000000000 +0200
-+++ openssl-0.9.8k/Makefile.org 2009-07-19 11:37:21.000000000 +0200
-@@ -155,7 +155,8 @@
- MANDIR=/usr/share/man
- MAN1=1
- MAN3=3
--MANSUFFIX=
-+MANSUFFIX=ssl
-+MANSECTION=SSL
- SHELL=/bin/sh
-
- TOP= .
-@@ -694,7 +695,7 @@
- echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
- (cd `$(PERL) util/dirname.pl $$i`; \
- sh -c "$$pod2man \
-- --section=$$sec --center=OpenSSL \
-+ --section=$${sec}$(MANSECTION) --center=OpenSSL \
- --release=$(VERSION) `basename $$i`") \
- > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
- $(PERL) util/extract-names.pl < $$i | \
-@@ -711,7 +712,7 @@
- echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
- (cd `$(PERL) util/dirname.pl $$i`; \
- sh -c "$$pod2man \
-- --section=$$sec --center=OpenSSL \
-+ --section=$${sec}$(MANSECTION) --center=OpenSSL \
- --release=$(VERSION) `basename $$i`") \
- > $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
- $(PERL) util/extract-names.pl < $$i | \
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/no-rpath.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/no-rpath.patch
deleted file mode 100644
index 53b7614..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/no-rpath.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8k/Makefile.shared
-===================================================================
---- openssl-0.9.8k.orig/Makefile.shared 2008-09-17 17:56:40.000000000 +0200
-+++ openssl-0.9.8k/Makefile.shared 2009-07-19 11:37:25.000000000 +0200
-@@ -151,7 +151,7 @@
- NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
-
--DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
-+DO_GNU_APP=LDFLAGS="$(CFLAGS)"
-
- #This is rather special. It's a special target with which one can link
- #applications without bothering with any features that have anything to
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/no-symbolic.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/no-symbolic.patch
deleted file mode 100644
index 87eadac..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/no-symbolic.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8k/Makefile.shared
-===================================================================
---- openssl-0.9.8k.orig/Makefile.shared 2009-07-19 11:35:02.000000000 +0200
-+++ openssl-0.9.8k/Makefile.shared 2009-07-19 11:35:48.000000000 +0200
-@@ -149,7 +149,7 @@
- SHLIB_SUFFIX=; \
- ALLSYMSFLAGS='-Wl,--whole-archive'; \
- NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
-- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
-+ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
-
- DO_GNU_APP=LDFLAGS="$(CFLAGS)"
-
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/perl-path.diff b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/perl-path.diff
deleted file mode 100644
index ced45a3..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/perl-path.diff
+++ /dev/null
@@ -1,762 +0,0 @@
-Upstream-Status: Backport [debian]
-
-From: Kurt Roeckx <kurt@roeckx.be>
-Subject: Change the perl path's to /usr/bin/perl
-
-This is the result of running:
-perl util/perlpath.pl /usr/bin
-
-The upstream sources have this set to various different paths.
-
---- openssl-0.9.8m.orig/Configure
-+++ openssl-0.9.8m/Configure
-@@ -1,4 +1,4 @@
--:
-+#!/usr/bin/perl
- eval 'exec perl -S $0 ${1+"$@"}'
- if $running_under_some_shell;
- ##
---- openssl-0.9.8m.orig/VMS/VMSify-conf.pl
-+++ openssl-0.9.8m/VMS/VMSify-conf.pl
-@@ -1,4 +1,4 @@
--#! /usr/bin/perl
-+#!/usr/bin/perl
-
- use strict;
- use warnings;
---- openssl-0.9.8m.orig/Netware/do_tests.pl
-+++ openssl-0.9.8m/Netware/do_tests.pl
-@@ -1,4 +1,4 @@
--# perl script to run OpenSSL tests
-+#!/usr/bin/perl
-
-
- my $base_path = "\\openssl";
---- openssl-0.9.8m.orig/apps/progs.pl
-+++ openssl-0.9.8m/apps/progs.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- print "/* apps/progs.h */\n";
- print "/* automatically generated by progs.pl for openssl.c */\n\n";
---- openssl-0.9.8m.orig/os2/backwardify.pl
-+++ openssl-0.9.8m/os2/backwardify.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/perl
- use strict;
-
- # Use as $0
---- openssl-0.9.8m.orig/times/091/mips-rel.pl
-+++ openssl-0.9.8m/times/091/mips-rel.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- &doit(100,"Pentium 100 32",0.0195,0.1000,0.6406,4.6100); # pentium-100
- &doit(200,"PPro 200 32",0.0070,0.0340,0.2087,1.4700); # pentium-100
---- openssl-0.9.8m.orig/fips/mkfipsscr.pl
-+++ openssl-0.9.8m/fips/mkfipsscr.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl
- # Quick & dirty utility to generate a script for executing the
- # FIPS 140-2 CMVP algorithm tests based on the pathnames of
- # input algorithm test files actually present (the unqualified
---- openssl-0.9.8m.orig/fips/fipsalgtest.pl
-+++ openssl-0.9.8m/fips/fipsalgtest.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/perl
- # Perl utility to run or verify FIPS 140-2 CMVP algorithm tests based on the
- # pathnames of input algorithm test files actually present (the unqualified
- # file names are consistent but the pathnames are not).
---- openssl-0.9.8m.orig/ms/uplink.pl
-+++ openssl-0.9.8m/ms/uplink.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- #
- # For Microsoft CL this is implemented as inline assembler. So that
- # even though this script can generate even Win32 code, we'll be
---- openssl-0.9.8m.orig/ms/segrenam.pl
-+++ openssl-0.9.8m/ms/segrenam.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
-
- my $quiet = 1;
-
---- openssl-0.9.8m.orig/ms/cmp.pl
-+++ openssl-0.9.8m/ms/cmp.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- ($#ARGV == 1) || die "usage: cmp.pl <file1> <file2>\n";
-
---- openssl-0.9.8m.orig/test/cms-test.pl
-+++ openssl-0.9.8m/test/cms-test.pl
-@@ -1,4 +1,4 @@
--# test/cms-test.pl
-+#!/usr/bin/perl
- # Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- # project.
- #
---- openssl-0.9.8m.orig/test/cms-examples.pl
-+++ openssl-0.9.8m/test/cms-examples.pl
-@@ -1,4 +1,4 @@
--# test/cms-examples.pl
-+#!/usr/bin/perl
- # Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
- # project.
- #
---- openssl-0.9.8m.orig/demos/b64.pl
-+++ openssl-0.9.8m/demos/b64.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- #
- # Make PEM encoded data have lines of 64 bytes of data
---- openssl-0.9.8m.orig/demos/tunala/configure.in
-+++ openssl-0.9.8m/demos/tunala/configure.in
-@@ -1,4 +1,4 @@
--dnl Process this file with autoconf to produce a configure script.
-+#!/usr/bin/perl
- AC_INIT(tunala.c)
- AM_CONFIG_HEADER(config.h)
- AM_INIT_AUTOMAKE(tunala, 0.0.1-dev)
---- openssl-0.9.8m.orig/crypto/x86cpuid.pl
-+++ openssl-0.9.8m/crypto/x86cpuid.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
-
- push(@INC,"perlasm");
- require "x86asm.pl";
---- openssl-0.9.8m.orig/crypto/x86_64cpuid.pl
-+++ openssl-0.9.8m/crypto/x86_64cpuid.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
-
- $output=shift;
- $masm=1 if ($output =~ /\.asm/);
---- openssl-0.9.8m.orig/crypto/md5/asm/md5-586.pl
-+++ openssl-0.9.8m/crypto/md5/asm/md5-586.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- # Normal is the
- # md5_block_x86(MD5_CTX *c, ULONG *X);
---- openssl-0.9.8m.orig/crypto/md5/asm/md5-x86_64.pl
-+++ openssl-0.9.8m/crypto/md5/asm/md5-x86_64.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/usr/bin/perl
- #
- # MD5 optimized for AMD64.
- #
---- openssl-0.9.8m.orig/crypto/sha/asm/sha1-ia64.pl
-+++ openssl-0.9.8m/crypto/sha/asm/sha1-ia64.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- #
- # ====================================================================
- # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
---- openssl-0.9.8m.orig/crypto/sha/asm/sha1-x86_64.pl
-+++ openssl-0.9.8m/crypto/sha/asm/sha1-x86_64.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- #
- # ====================================================================
- # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
---- openssl-0.9.8m.orig/crypto/sha/asm/sha512-sse2.pl
-+++ openssl-0.9.8m/crypto/sha/asm/sha512-sse2.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- #
- # ====================================================================
- # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
---- openssl-0.9.8m.orig/crypto/sha/asm/sha512-ia64.pl
-+++ openssl-0.9.8m/crypto/sha/asm/sha512-ia64.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- #
- # ====================================================================
- # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
---- openssl-0.9.8m.orig/crypto/sha/asm/sha512-x86_64.pl
-+++ openssl-0.9.8m/crypto/sha/asm/sha512-x86_64.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- #
- # ====================================================================
- # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
---- openssl-0.9.8m.orig/crypto/sha/asm/sha1-586.pl
-+++ openssl-0.9.8m/crypto/sha/asm/sha1-586.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
-
- # ====================================================================
- # [Re]written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
---- openssl-0.9.8m.orig/crypto/des/asm/des-586.pl
-+++ openssl-0.9.8m/crypto/des/asm/des-586.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # The inner loop instruction sequence and the IP/FP modifications are from
- # Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>
---- openssl-0.9.8m.orig/crypto/des/asm/desboth.pl
-+++ openssl-0.9.8m/crypto/des/asm/desboth.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- $L="edi";
- $R="esi";
---- openssl-0.9.8m.orig/crypto/des/asm/des686.pl
-+++ openssl-0.9.8m/crypto/des/asm/des686.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- $prog="des686.pl";
-
---- openssl-0.9.8m.orig/crypto/des/asm/crypt586.pl
-+++ openssl-0.9.8m/crypto/des/asm/crypt586.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # The inner loop instruction sequence and the IP/FP modifications are from
- # Svend Olaf Mikkelsen <svolaf@inet.uni-c.dk>
---- openssl-0.9.8m.orig/crypto/lhash/num.pl
-+++ openssl-0.9.8m/crypto/lhash/num.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- #node 10 -> 4
-
---- openssl-0.9.8m.orig/crypto/ripemd/asm/rmd-586.pl
-+++ openssl-0.9.8m/crypto/ripemd/asm/rmd-586.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- # Normal is the
- # ripemd160_block_asm_data_order(RIPEMD160_CTX *c, ULONG *X,int blocks);
---- openssl-0.9.8m.orig/crypto/rc4/asm/rc4-586.pl
-+++ openssl-0.9.8m/crypto/rc4/asm/rc4-586.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- # At some point it became apparent that the original SSLeay RC4
- # assembler implementation performs suboptimaly on latest IA-32
---- openssl-0.9.8m.orig/crypto/rc4/asm/rc4-x86_64.pl
-+++ openssl-0.9.8m/crypto/rc4/asm/rc4-x86_64.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- #
- # ====================================================================
- # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
---- openssl-0.9.8m.orig/crypto/cast/asm/cast-586.pl
-+++ openssl-0.9.8m/crypto/cast/asm/cast-586.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- # define for pentium pro friendly version
- $ppro=1;
---- openssl-0.9.8m.orig/crypto/rc5/asm/rc5-586.pl
-+++ openssl-0.9.8m/crypto/rc5/asm/rc5-586.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- push(@INC,"perlasm","../../perlasm");
- require "x86asm.pl";
---- openssl-0.9.8m.orig/crypto/perlasm/x86ms.pl
-+++ openssl-0.9.8m/crypto/perlasm/x86ms.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- package x86ms;
-
---- openssl-0.9.8m.orig/crypto/perlasm/x86asm.pl
-+++ openssl-0.9.8m/crypto/perlasm/x86asm.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- # require 'x86asm.pl';
- # &asm_init("cpp","des-586.pl");
---- openssl-0.9.8m.orig/crypto/perlasm/x86nasm.pl
-+++ openssl-0.9.8m/crypto/perlasm/x86nasm.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- package x86nasm;
-
---- openssl-0.9.8m.orig/crypto/perlasm/x86unix.pl
-+++ openssl-0.9.8m/crypto/perlasm/x86unix.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- package x86unix; # GAS actually...
-
---- openssl-0.9.8m.orig/crypto/perlasm/cbc.pl
-+++ openssl-0.9.8m/crypto/perlasm/cbc.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- # void des_ncbc_encrypt(input, output, length, schedule, ivec, enc)
- # des_cblock (*input);
---- openssl-0.9.8m.orig/crypto/perlasm/x86_64-xlate.pl
-+++ openssl-0.9.8m/crypto/perlasm/x86_64-xlate.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
-
- # Ascetic x86_64 AT&T to MASM assembler translator by <appro>.
- #
---- openssl-0.9.8m.orig/crypto/bf/asm/bf-686.pl
-+++ openssl-0.9.8m/crypto/bf/asm/bf-686.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- push(@INC,"perlasm","../../perlasm");
- require "x86asm.pl";
---- openssl-0.9.8m.orig/crypto/bf/asm/bf-586.pl
-+++ openssl-0.9.8m/crypto/bf/asm/bf-586.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- push(@INC,"perlasm","../../perlasm");
- require "x86asm.pl";
---- openssl-0.9.8m.orig/crypto/objects/objects.pl
-+++ openssl-0.9.8m/crypto/objects/objects.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- open (NUMIN,"$ARGV[1]") || die "Can't open number file $ARGV[1]";
- $max_nid=0;
---- openssl-0.9.8m.orig/crypto/objects/obj_dat.pl
-+++ openssl-0.9.8m/crypto/objects/obj_dat.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- # fixes bug in floating point emulation on sparc64 when
- # this script produces off-by-one output on sparc64
---- openssl-0.9.8m.orig/crypto/conf/keysets.pl
-+++ openssl-0.9.8m/crypto/conf/keysets.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- $NUMBER=0x01;
- $UPPER=0x02;
---- openssl-0.9.8m.orig/crypto/bn/bn_prime.pl
-+++ openssl-0.9.8m/crypto/bn/bn_prime.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # bn_prime.pl
-
- $num=2048;
---- openssl-0.9.8m.orig/crypto/bn/asm/x86.pl
-+++ openssl-0.9.8m/crypto/bn/asm/x86.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- push(@INC,"perlasm","../../perlasm");
- require "x86asm.pl";
---- openssl-0.9.8m.orig/crypto/bn/asm/ppc.pl
-+++ openssl-0.9.8m/crypto/bn/asm/ppc.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- #
- # Implemented as a Perl wrapper as we want to support several different
- # architectures with single file. We pick up the target based on the
---- openssl-0.9.8m.orig/crypto/bn/asm/co-586.pl
-+++ openssl-0.9.8m/crypto/bn/asm/co-586.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- push(@INC,"perlasm","../../perlasm");
- require "x86asm.pl";
---- openssl-0.9.8m.orig/crypto/bn/asm/bn-586.pl
-+++ openssl-0.9.8m/crypto/bn/asm/bn-586.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- push(@INC,"perlasm","../../perlasm");
- require "x86asm.pl";
---- openssl-0.9.8m.orig/crypto/bn/asm/mo-586.pl
-+++ openssl-0.9.8m/crypto/bn/asm/mo-586.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
-
- # This is crypto/bn/asm/x86-mont.pl (with asciz from crypto/perlasm/x86asm.pl)
- # from OpenSSL 0.9.9-dev
---- openssl-0.9.8m.orig/crypto/bn/asm/x86_64-mont.pl
-+++ openssl-0.9.8m/crypto/bn/asm/x86_64-mont.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
-
- # ====================================================================
- # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
---- openssl-0.9.8m.orig/crypto/bn/asm/x86/comba.pl
-+++ openssl-0.9.8m/crypto/bn/asm/x86/comba.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # x86 assember
-
- sub mul_add_c
---- openssl-0.9.8m.orig/crypto/bn/asm/x86/add.pl
-+++ openssl-0.9.8m/crypto/bn/asm/x86/add.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # x86 assember
-
- sub bn_add_words
---- openssl-0.9.8m.orig/crypto/bn/asm/x86/mul.pl
-+++ openssl-0.9.8m/crypto/bn/asm/x86/mul.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # x86 assember
-
- sub bn_mul_words
---- openssl-0.9.8m.orig/crypto/bn/asm/x86/mul_add.pl
-+++ openssl-0.9.8m/crypto/bn/asm/x86/mul_add.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # x86 assember
-
- sub bn_mul_add_words
---- openssl-0.9.8m.orig/crypto/bn/asm/x86/sqr.pl
-+++ openssl-0.9.8m/crypto/bn/asm/x86/sqr.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # x86 assember
-
- sub bn_sqr_words
---- openssl-0.9.8m.orig/crypto/bn/asm/x86/sub.pl
-+++ openssl-0.9.8m/crypto/bn/asm/x86/sub.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # x86 assember
-
- sub bn_sub_words
---- openssl-0.9.8m.orig/crypto/bn/asm/x86/div.pl
-+++ openssl-0.9.8m/crypto/bn/asm/x86/div.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # x86 assember
-
- sub bn_div_words
---- openssl-0.9.8m.orig/crypto/aes/asm/aes-586.pl
-+++ openssl-0.9.8m/crypto/aes/asm/aes-586.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- #
- # ====================================================================
- # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
---- openssl-0.9.8m.orig/crypto/aes/asm/aes-x86_64.pl
-+++ openssl-0.9.8m/crypto/aes/asm/aes-x86_64.pl
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/usr/bin/perl
- #
- # ====================================================================
- # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
---- openssl-0.9.8m.orig/crypto/asn1/charmap.pl
-+++ openssl-0.9.8m/crypto/asn1/charmap.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl
-
- use strict;
-
---- openssl-0.9.8m.orig/util/mksdef.pl
-+++ openssl-0.9.8m/util/mksdef.pl
-@@ -1,4 +1,4 @@
--
-+#!/usr/bin/perl
- # Perl script to split libeay32.def into two distinct DEF files for use in
- # fipdso mode. It works out symbols in each case by running "link" command and
- # parsing the output to find the list of missing symbols then splitting
---- openssl-0.9.8m.orig/util/dirname.pl
-+++ openssl-0.9.8m/util/dirname.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- if ($#ARGV < 0) {
- die "dirname.pl: too few arguments\n";
---- openssl-0.9.8m.orig/util/tab_num.pl
-+++ openssl-0.9.8m/util/tab_num.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- $num=1;
- $width=40;
---- openssl-0.9.8m.orig/util/sp-diff.pl
-+++ openssl-0.9.8m/util/sp-diff.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # This file takes as input, the files that have been output from
- # ssleay speed.
---- openssl-0.9.8m.orig/util/mkerr.pl
-+++ openssl-0.9.8m/util/mkerr.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl
-
- my $config = "crypto/err/openssl.ec";
- my $debug = 0;
---- openssl-0.9.8m.orig/util/clean-depend.pl
-+++ openssl-0.9.8m/util/clean-depend.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl
- # Clean the dependency list in a makefile of standard includes...
- # Written by Ben Laurie <ben@algroup.co.uk> 19 Jan 1999
-
---- openssl-0.9.8m.orig/util/add_cr.pl
-+++ openssl-0.9.8m/util/add_cr.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # This adds a copyright message to a souce code file.
- # It also gets the file name correct.
---- openssl-0.9.8m.orig/util/pod2man.pl
-+++ openssl-0.9.8m/util/pod2man.pl
-@@ -1,4 +1,4 @@
--: #!/usr/bin/perl-5.005
-+#!/usr/bin/perl
- eval 'exec /usr/bin/perl -S $0 ${1+"$@"}'
- if $running_under_some_shell;
-
---- openssl-0.9.8m.orig/util/mkstack.pl
-+++ openssl-0.9.8m/util/mkstack.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl
-
- # This is a utility that searches out "DECLARE_STACK_OF()"
- # declarations in .h and .c files, and updates/creates/replaces
---- openssl-0.9.8m.orig/util/selftest.pl
-+++ openssl-0.9.8m/util/selftest.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl
- #
- # Run the test suite and generate a report
- #
---- openssl-0.9.8m.orig/util/ck_errf.pl
-+++ openssl-0.9.8m/util/ck_errf.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # This is just a quick script to scan for cases where the 'error'
- # function name in a XXXerr() macro is wrong.
---- openssl-0.9.8m.orig/util/mklink.pl
-+++ openssl-0.9.8m/util/mklink.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- # mklink.pl
-
---- openssl-0.9.8m.orig/util/src-dep.pl
-+++ openssl-0.9.8m/util/src-dep.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- # we make up an array of
- # $file{function_name}=filename;
---- openssl-0.9.8m.orig/util/deleof.pl
-+++ openssl-0.9.8m/util/deleof.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- while (<>)
- {
---- openssl-0.9.8m.orig/util/arx.pl
-+++ openssl-0.9.8m/util/arx.pl
-@@ -1,4 +1,4 @@
--#!/bin/perl
-+#!/usr/bin/perl
-
- # Simple perl script to wrap round "ar" program and exclude any
- # object files in the environment variable EXCL_OBJ
---- openssl-0.9.8m.orig/util/copy.pl
-+++ openssl-0.9.8m/util/copy.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- use Fcntl;
-
---- openssl-0.9.8m.orig/util/mkdir-p.pl
-+++ openssl-0.9.8m/util/mkdir-p.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- # mkdir-p.pl
-
---- openssl-0.9.8m.orig/util/mkdef.pl
-+++ openssl-0.9.8m/util/mkdef.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl -w
-+#!/usr/bin/perl
- #
- # generate a .def file
- #
---- openssl-0.9.8m.orig/util/files.pl
-+++ openssl-0.9.8m/util/files.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # used to generate the file MINFO for use by util/mk1mf.pl
- # It is basically a list of all variables from the passed makefile
---- openssl-0.9.8m.orig/util/mkfiles.pl
-+++ openssl-0.9.8m/util/mkfiles.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # This is a hacked version of files.pl for systems that can't do a 'make files'.
- # Do a perl util/mkminfo.pl >MINFO to build MINFO
---- openssl-0.9.8m.orig/util/perlpath.pl
-+++ openssl-0.9.8m/util/perlpath.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # modify the '#!/usr/local/bin/perl'
- # line in all scripts that rely on perl.
---- openssl-0.9.8m.orig/util/mk1mf.pl
-+++ openssl-0.9.8m/util/mk1mf.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # A bit of an evil hack but it post processes the file ../MINFO which
- # is generated by `make files` in the top directory.
- # This script outputs one mega makefile that has no shell stuff or any
---- openssl-0.9.8m.orig/util/err-ins.pl
-+++ openssl-0.9.8m/util/err-ins.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # tack error codes onto the end of a file
- #
---- openssl-0.9.8m.orig/util/pl/Mingw32.pl
-+++ openssl-0.9.8m/util/pl/Mingw32.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # Mingw32.pl -- Mingw
- #
---- openssl-0.9.8m.orig/util/pl/unix.pl
-+++ openssl-0.9.8m/util/pl/unix.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # unix.pl - the standard unix makefile stuff.
- #
---- openssl-0.9.8m.orig/util/pl/netware.pl
-+++ openssl-0.9.8m/util/pl/netware.pl
-@@ -1,4 +1,4 @@
--# Metrowerks Codewarrior or gcc / nlmconv for NetWare
-+#!/usr/bin/perl
- #
-
- $version_header = "crypto/opensslv.h";
---- openssl-0.9.8m.orig/util/pl/VC-32.pl
-+++ openssl-0.9.8m/util/pl/VC-32.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # VC-32.pl - unified script for Microsoft Visual C++, covering Win32,
- # Win64 and WinCE [follow $FLAVOR variable to trace the differences].
- #
---- openssl-0.9.8m.orig/util/pl/OS2-EMX.pl
-+++ openssl-0.9.8m/util/pl/OS2-EMX.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # OS2-EMX.pl - for EMX GCC on OS/2
- #
---- openssl-0.9.8m.orig/util/pl/ultrix.pl
-+++ openssl-0.9.8m/util/pl/ultrix.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # linux.pl - the standard unix makefile stuff.
- #
---- openssl-0.9.8m.orig/util/pl/linux.pl
-+++ openssl-0.9.8m/util/pl/linux.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #
- # linux.pl - the standard unix makefile stuff.
- #
---- openssl-0.9.8m.orig/util/pl/BC-32.pl
-+++ openssl-0.9.8m/util/pl/BC-32.pl
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- # Borland C++ builder 3 and 4 -- Janez Jere <jj@void.si>
- #
-
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/pic.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/pic.patch
deleted file mode 100644
index 5fc8f65..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/pic.patch
+++ /dev/null
@@ -1,303 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8o/crypto/Makefile
-===================================================================
---- openssl-0.9.8o.orig/crypto/Makefile 2008-09-17 17:10:55.000000000 +0000
-+++ openssl-0.9.8o/crypto/Makefile 2010-06-06 13:09:28.000000000 +0000
-@@ -57,7 +57,7 @@
- echo " #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \
- echo '#endif' ) >buildinf.h
-
--x86cpuid-elf.s: x86cpuid.pl perlasm/x86asm.pl
-+x86cpuid-elf.S: x86cpuid.pl perlasm/x86asm.pl
- $(PERL) x86cpuid.pl elf $(CFLAGS) $(PROCESSOR) > $@
- x86cpuid-cof.s: x86cpuid.pl perlasm/x86asm.pl
- $(PERL) x86cpuid.pl coff $(CFLAGS) $(PROCESSOR) > $@
-@@ -70,7 +70,7 @@
- uplink-cof.s: ../ms/uplink.pl
- $(PERL) ../ms/uplink.pl coff > $@
-
--x86_64cpuid.s: x86_64cpuid.pl
-+x86_64cpuid.S: x86_64cpuid.pl
- $(PERL) x86_64cpuid.pl $@
- ia64cpuid.s: ia64cpuid.S
- $(CC) $(CFLAGS) -E ia64cpuid.S > $@
-Index: openssl-0.9.8o/crypto/x86_64cpuid.pl
-===================================================================
---- openssl-0.9.8o.orig/crypto/x86_64cpuid.pl 2007-11-11 16:25:00.000000000 +0000
-+++ openssl-0.9.8o/crypto/x86_64cpuid.pl 2010-06-06 13:09:28.000000000 +0000
-@@ -95,7 +95,11 @@
- .size OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu
-
- .section .init
-+#ifdef OPENSSL_PIC
-+ call OPENSSL_cpuid_setup\@PLT
-+#else
- call OPENSSL_cpuid_setup
-+#endif
-
- ___
-
-Index: openssl-0.9.8o/crypto/md5/Makefile
-===================================================================
---- openssl-0.9.8o.orig/crypto/md5/Makefile 2008-09-17 17:11:02.000000000 +0000
-+++ openssl-0.9.8o/crypto/md5/Makefile 2010-06-06 13:09:28.000000000 +0000
-@@ -52,7 +52,8 @@
- mx86-out.s: asm/md5-586.pl ../perlasm/x86asm.pl
- (cd asm; $(PERL) md5-586.pl a.out $(CFLAGS) > ../$@)
-
--md5-x86_64.s: asm/md5-x86_64.pl; $(PERL) asm/md5-x86_64.pl $@
-+md5-x86_64.s: asm/md5-x86_64.pl
-+ $(PERL) asm/md5-x86_64.pl $@
-
- files:
- $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-Index: openssl-0.9.8o/crypto/des/asm/desboth.pl
-===================================================================
---- openssl-0.9.8o.orig/crypto/des/asm/desboth.pl 2001-10-24 21:20:56.000000000 +0000
-+++ openssl-0.9.8o/crypto/des/asm/desboth.pl 2010-06-06 13:09:28.000000000 +0000
-@@ -16,6 +16,11 @@
-
- &push("edi");
-
-+ &call (&label("pic_point0"));
-+ &set_label("pic_point0");
-+ &blindpop("ebp");
-+ &add ("ebp", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]");
-+
- &comment("");
- &comment("Load the data words");
- &mov($L,&DWP(0,"ebx","",0));
-@@ -47,15 +52,21 @@
- &mov(&swtmp(2), (DWC(($enc)?"1":"0")));
- &mov(&swtmp(1), "eax");
- &mov(&swtmp(0), "ebx");
-- &call("DES_encrypt2");
-+ &exch("ebx", "ebp");
-+ &call("DES_encrypt2\@PLT");
-+ &exch("ebx", "ebp");
- &mov(&swtmp(2), (DWC(($enc)?"0":"1")));
- &mov(&swtmp(1), "edi");
- &mov(&swtmp(0), "ebx");
-- &call("DES_encrypt2");
-+ &exch("ebx", "ebp");
-+ &call("DES_encrypt2\@PLT");
-+ &exch("ebx", "ebp");
- &mov(&swtmp(2), (DWC(($enc)?"1":"0")));
- &mov(&swtmp(1), "esi");
- &mov(&swtmp(0), "ebx");
-- &call("DES_encrypt2");
-+ &exch("ebx", "ebp");
-+ &call("DES_encrypt2\@PLT");
-+ &exch("ebx", "ebp");
-
- &stack_pop(3);
- &mov($L,&DWP(0,"ebx","",0));
-Index: openssl-0.9.8o/crypto/rc4/Makefile
-===================================================================
---- openssl-0.9.8o.orig/crypto/rc4/Makefile 2008-11-19 16:03:50.000000000 +0000
-+++ openssl-0.9.8o/crypto/rc4/Makefile 2010-06-06 13:09:28.000000000 +0000
-@@ -51,7 +51,7 @@
- rx86-out.s: asm/rc4-586.pl ../perlasm/x86asm.pl
- (cd asm; $(PERL) rc4-586.pl a.out $(CFLAGS) > ../$@)
-
--rc4-x86_64.s: asm/rc4-x86_64.pl; $(PERL) asm/rc4-x86_64.pl $@
-+rc4-x86_64.S: asm/rc4-x86_64.pl; $(PERL) asm/rc4-x86_64.pl $@
-
- rc4-ia64.s: asm/rc4-ia64.S
- @case `awk '/^#define RC4_INT/{print$$NF}' $(TOP)/include/openssl/opensslconf.h` in \
-Index: openssl-0.9.8o/crypto/rc4/asm/rc4-x86_64.pl
-===================================================================
---- openssl-0.9.8o.orig/crypto/rc4/asm/rc4-x86_64.pl 2008-09-16 10:47:27.000000000 +0000
-+++ openssl-0.9.8o/crypto/rc4/asm/rc4-x86_64.pl 2010-06-06 13:09:28.000000000 +0000
-@@ -270,7 +270,11 @@
- xor %r10,%r10
- xor %r11,%r11
-
-+#ifdef OPENSSL_PIC
-+ mov OPENSSL_ia32cap_P\@GOTPCREL(%rip),$idx#d
-+#else
- mov OPENSSL_ia32cap_P(%rip),$idx#d
-+#endif
- bt \$20,$idx#d
- jnc .Lw1stloop
- bt \$30,$idx#d
-@@ -338,7 +342,11 @@
- RC4_options:
- .picmeup %rax
- lea .Lopts-.(%rax),%rax
-+#ifdef OPENSSL_PIC
-+ mov OPENSSL_ia32cap_P\@GOTPCREL(%rip),%edx
-+#else
- mov OPENSSL_ia32cap_P(%rip),%edx
-+#endif
- bt \$20,%edx
- jnc .Ldone
- add \$12,%rax
-Index: openssl-0.9.8o/crypto/perlasm/x86unix.pl
-===================================================================
---- openssl-0.9.8o.orig/crypto/perlasm/x86unix.pl 2008-05-01 23:11:32.000000000 +0000
-+++ openssl-0.9.8o/crypto/perlasm/x86unix.pl 2010-06-06 13:09:28.000000000 +0000
-@@ -400,6 +400,29 @@
- $stack=4;
- }
-
-+sub main'function_begin_B_static
-+ {
-+ local($func,$extra)=@_;
-+
-+ &main'external_label($func);
-+ $func=$under.$func;
-+
-+ local($tmp)=<<"EOF";
-+.text
-+EOF
-+ push(@out,$tmp);
-+ if ($main'cpp)
-+ { push(@out,"TYPE($func,\@function)\n"); }
-+ elsif ($main'coff)
-+ { $tmp=push(@out,".def\t$func;\t.scl\t2;\t.type\t32;\t.endef\n"); }
-+ elsif ($main'aout and !$main'pic)
-+ { }
-+ else { push(@out,".type $func,\@function\n"); }
-+ push(@out,".align\t$align\n");
-+ push(@out,"$func:\n");
-+ $stack=4;
-+ }
-+
- sub main'function_end
- {
- local($func)=@_;
-@@ -694,7 +717,17 @@
- {
- $tmp=<<___;
- .section .init
-+#ifdef OPENSSL_PIC
-+ pushl %ebx
-+ call .pic_point0
-+.pic_point0:
-+ popl %ebx
-+ addl \$_GLOBAL_OFFSET_TABLE_+[.-.pic_point0],%ebx
-+ call $under$f\@PLT
-+ popl %ebx
-+#else
- call $under$f
-+#endif
- jmp .Linitalign
- .align $align
- .Linitalign:
-Index: openssl-0.9.8o/crypto/perlasm/cbc.pl
-===================================================================
---- openssl-0.9.8o.orig/crypto/perlasm/cbc.pl 2005-05-09 21:48:00.000000000 +0000
-+++ openssl-0.9.8o/crypto/perlasm/cbc.pl 2010-06-06 13:09:28.000000000 +0000
-@@ -122,7 +122,11 @@
- &mov(&DWP($data_off,"esp","",0), "eax"); # put in array for call
- &mov(&DWP($data_off+4,"esp","",0), "ebx"); #
-
-- &call($enc_func);
-+ &call (&label("pic_point0"));
-+ &set_label("pic_point0");
-+ &blindpop("ebx");
-+ &add ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]");
-+ &call("$enc_func\@PLT");
-
- &mov("eax", &DWP($data_off,"esp","",0));
- &mov("ebx", &DWP($data_off+4,"esp","",0));
-@@ -187,7 +191,11 @@
- &mov(&DWP($data_off,"esp","",0), "eax"); # put in array for call
- &mov(&DWP($data_off+4,"esp","",0), "ebx"); #
-
-- &call($enc_func);
-+ &call (&label("pic_point1"));
-+ &set_label("pic_point1");
-+ &blindpop("ebx");
-+ &add ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point1") . "]");
-+ &call("$enc_func\@PLT");
-
- &mov("eax", &DWP($data_off,"esp","",0));
- &mov("ebx", &DWP($data_off+4,"esp","",0));
-@@ -220,7 +228,11 @@
- &mov(&DWP($data_off,"esp","",0), "eax"); # put back
- &mov(&DWP($data_off+4,"esp","",0), "ebx"); #
-
-- &call($dec_func);
-+ &call (&label("pic_point2"));
-+ &set_label("pic_point2");
-+ &blindpop("ebx");
-+ &add ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point2") . "]");
-+ &call("$dec_func\@PLT");
-
- &mov("eax", &DWP($data_off,"esp","",0)); # get return
- &mov("ebx", &DWP($data_off+4,"esp","",0)); #
-@@ -263,7 +275,11 @@
- &mov(&DWP($data_off,"esp","",0), "eax"); # put back
- &mov(&DWP($data_off+4,"esp","",0), "ebx"); #
-
-- &call($dec_func);
-+ &call (&label("pic_point3"));
-+ &set_label("pic_point3");
-+ &blindpop("ebx");
-+ &add ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point3") . "]");
-+ &call("$dec_func\@PLT");
-
- &mov("eax", &DWP($data_off,"esp","",0)); # get return
- &mov("ebx", &DWP($data_off+4,"esp","",0)); #
-Index: openssl-0.9.8o/crypto/perlasm/x86_64-xlate.pl
-===================================================================
---- openssl-0.9.8o.orig/crypto/perlasm/x86_64-xlate.pl 2010-06-06 13:09:00.000000000 +0000
-+++ openssl-0.9.8o/crypto/perlasm/x86_64-xlate.pl 2010-06-06 13:09:28.000000000 +0000
-@@ -435,7 +435,7 @@
-
- chomp($line);
-
-- $line =~ s|[#!].*$||; # get rid of asm-style comments...
-+# $line =~ s|[#!].*$||; # get rid of asm-style comments...
- $line =~ s|/\*.*\*/||; # ... and C-style comments...
- $line =~ s|^\s+||; # ... and skip white spaces in beginning
-
-Index: openssl-0.9.8o/crypto/aes/asm/aes-586.pl
-===================================================================
---- openssl-0.9.8o.orig/crypto/aes/asm/aes-586.pl 2008-12-17 14:14:51.000000000 +0000
-+++ openssl-0.9.8o/crypto/aes/asm/aes-586.pl 2010-06-06 13:09:28.000000000 +0000
-@@ -250,7 +250,7 @@
- sub _data_word() { my $i; while(defined($i=shift)) { &data_word($i,$i); } }
-
- &public_label("AES_Te");
--&function_begin_B("_x86_AES_encrypt");
-+&function_begin_B_static("_x86_AES_encrypt");
- if ($vertical_spin) {
- # I need high parts of volatile registers to be accessible...
- &exch ($s1="edi",$key="ebx");
-@@ -539,7 +539,7 @@
- }
-
- &public_label("AES_Td");
--&function_begin_B("_x86_AES_decrypt");
-+&function_begin_B_static("_x86_AES_decrypt");
- # note that caller is expected to allocate stack frame for me!
- &mov (&DWP(12,"esp"),$key); # save key
-
-@@ -1461,15 +1461,22 @@
- &public_label("AES_Td");
- &public_label("AES_Te");
- &function_begin_B("AES_set_decrypt_key");
-+ &push ("ebx");
- &mov ("eax",&wparam(0));
- &mov ("ecx",&wparam(1));
- &mov ("edx",&wparam(2));
- &sub ("esp",12);
-+
-+ &call (&label("pic_point0"));
-+ &set_label("pic_point0");
-+ &blindpop("ebx");
-+ &add ("ebx", "\$_GLOBAL_OFFSET_TABLE_+[.-" . &label("pic_point0") . "]");
- &mov (&DWP(0,"esp"),"eax");
- &mov (&DWP(4,"esp"),"ecx");
- &mov (&DWP(8,"esp"),"edx");
-- &call ("AES_set_encrypt_key");
-+ &call ("AES_set_encrypt_key\@PLT");
- &add ("esp",12);
-+ &pop ("ebx");
- &cmp ("eax",0);
- &je (&label("proceed"));
- &ret ();
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/pkg-config.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/pkg-config.patch
deleted file mode 100644
index 46c6f03..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/pkg-config.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8k/Makefile.org
-===================================================================
---- openssl-0.9.8k.orig/Makefile.org 2009-07-19 11:34:56.000000000 +0200
-+++ openssl-0.9.8k/Makefile.org 2009-07-19 11:36:02.000000000 +0200
-@@ -444,7 +444,8 @@
- echo 'Description: OpenSSL cryptography library'; \
- echo 'Version: '$(VERSION); \
- echo 'Requires: '; \
-- echo 'Libs: -L$${libdir} -lcrypto $(EX_LIBS)'; \
-+ echo 'Libs: -L$${libdir} -lcrypto'; \
-+ echo 'Libs.private: $(EX_LIBS)'; \
- echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc
-
- libssl.pc: Makefile
-@@ -457,7 +458,8 @@
- echo 'Description: Secure Sockets Layer and cryptography libraries'; \
- echo 'Version: '$(VERSION); \
- echo 'Requires: '; \
-- echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
-+ echo 'Libs: -L$${libdir} -lssl'; \
-+ echo 'Libs.private: -lcrypto $(EX_LIBS)'; \
- echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
-
- openssl.pc: Makefile
-@@ -470,7 +472,8 @@
- echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
- echo 'Version: '$(VERSION); \
- echo 'Requires: '; \
-- echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
-+ echo 'Libs: -L$${libdir} -lssl -lcrypto'; \
-+ echo 'Libs.private: $(EX_LIBS)'; \
- echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
-
- Makefile: Makefile.org Configure config
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rc4-amd64.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rc4-amd64.patch
deleted file mode 100644
index f57fbc9..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rc4-amd64.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8k/Configure
-===================================================================
---- openssl-0.9.8k.orig/Configure 2009-07-19 11:32:41.000000000 +0200
-+++ openssl-0.9.8k/Configure 2009-07-19 11:37:10.000000000 +0200
-@@ -128,6 +128,9 @@
- my $x86_out_asm="x86cpuid-out.o:bn86-out.o co86-out.o MAYBE-MO86-out.o:dx86-out.o yx86-out.o:ax86-out.o:bx86-out.o:mx86-out.o:sx86-out.o s512sse2-out.o:cx86-out.o:rx86-out.o rc4_skey.o:rm86-out.o:r586-out.o";
-
- my $x86_64_asm="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::rc4-x86_64.o::";
-+# rc4 asm is disabled on amd64 because we configured it with RC4_CHAR while
-+# the assembler only works with int
-+my $x86_64_asm_linux="x86_64cpuid.o:x86_64-gcc.o x86_64-mont.o::aes-x86_64.o::md5-x86_64.o:sha1-x86_64.o sha256-x86_64.o sha512-x86_64.o::::";
- my $ia64_asm=":bn-ia64.o::aes_core.o aes_cbc.o aes-ia64.o:::sha1-ia64.o sha256-ia64.o sha512-ia64.o::rc4-ia64.o rc4_skey.o::";
-
- my $no_asm="::::::::::";
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rehash-crt.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rehash-crt.patch
deleted file mode 100644
index d9d6b70..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rehash-crt.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8k/tools/c_rehash.in
-===================================================================
---- openssl-0.9.8k.orig/tools/c_rehash.in 2002-10-11 22:31:27.000000000 +0200
-+++ openssl-0.9.8k/tools/c_rehash.in 2009-07-19 11:36:26.000000000 +0200
-@@ -59,12 +59,15 @@
- }
- }
- closedir DIR;
-- FILE: foreach $fname (grep {/\.pem$/} @flist) {
-+ FILE: foreach $fname (grep {/\.pem$|\.crt$/} @flist) {
- # Check to see if certificates and/or CRLs present.
- my ($cert, $crl) = check_file($fname);
- if(!$cert && !$crl) {
-- print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n";
-- next;
-+ ($cert, $crl) = check_file("$openssl x509 -in \"$fname\" -inform der -outform pem | ");
-+ if(!$cert && !$crl) {
-+ print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n";
-+ next;
-+ }
- }
- link_hash_cert($fname) if($cert);
- link_hash_crl($fname) if($crl);
-@@ -102,6 +105,9 @@
- my $fname = $_[0];
- $fname =~ s/'/'\\''/g;
- my ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in '$fname'`;
-+ if(!$hash || !fprint) {
-+ ($hash, $fprint) = `"$openssl" x509 -hash -fingerprint -noout -in '$fname' -inform der`;
-+ }
- chomp $hash;
- chomp $fprint;
- $fprint =~ s/^.*=//;
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rehash_pod.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rehash_pod.patch
deleted file mode 100644
index 3426ba8..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/rehash_pod.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8k/doc/apps/c_rehash.pod
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ openssl-0.9.8k/doc/apps/c_rehash.pod 2009-07-19 11:36:27.000000000 +0200
-@@ -0,0 +1,55 @@
-+
-+=pod
-+
-+=head1 NAME
-+
-+c_rehash - Create symbolic links to files named by the hash values
-+
-+=head1 SYNOPSIS
-+
-+B<c_rehash>
-+[directory] ...
-+
-+=head1 DESCRIPTION
-+
-+c_rehash scans directories and takes a hash value of each .pem and .crt file in the directory. It then creates symbolic links for each of the files named by the hash value. This is useful as many programs require directories to be set up like this in order to find the certificates they require.
-+
-+If any directories are named on the command line then these directories are processed in turn. If not then and the environment variable SSL_CERT_DIR is defined then that is consulted. This variable should be a colon (:) separated list of directories, all of which will be processed. If neither of these conditions are true then /usr/lib/ssl/certs is processed.
-+
-+For each directory that is to be processed he user must have write permissions on the directory, if they do not then nothing will be printed for that directory.
-+
-+Note that this program deletes all the symbolic links that look like ones that it creates before processing a directory. Beware that if you run the program on a directory that contains symbolic links for other purposes that are named in the same format as those created by this program they will be lost.
-+
-+The hashes for certificate files are of the form <hash>.<n> where n is an integer. If the hash value already exists then n will be incremented, unless the file is a duplicate. Duplicates are detected using the fingerprint of the certificate. A warning will be printed if a duplicate is detected. The hashes for CRL files are of the form <hash>.r<n> and have the same behavior.
-+
-+The program will also warn if there are files with extension .pem which are not certificate or CRL files.
-+
-+The program uses the openssl program to compute the hashes and fingerprints. It expects the executable to be named openssl and be on the PATH, or in the /usr/lib/ssl/bin directory. If the OPENSSL environment variable is defined then this is used instead as the executable that provides the hashes and fingerprints. When called as $OPENSSL x509 -hash -fingerprint -noout -in $file it must output the hash of $file on the first line followed by the fingerprint on the second line, optionally prefixed with some text and an equals sign (=).
-+
-+=head1 OPTIONS
-+
-+None
-+
-+=head1 ENVIRONMENT
-+
-+=over 4
-+
-+=item B<OPENSSL>
-+
-+The name (and path) of an executable to use to generate hashes and fingerprints (see above).
-+
-+=item B<SSL_CERT_DIR>
-+
-+Colon separated list of directories to operate on. Ignored if directories are listed on the command line.
-+
-+=head1 SEE ALSO
-+
-+L<openssl(1)|openssl(1)>, L<x509(1)|x509(1)>
-+
-+=back
-+
-+=head1 BUGS
-+
-+No known bugs
-+
-+=cut
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/series b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/series
deleted file mode 100644
index b764c04..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/series
+++ /dev/null
@@ -1,20 +0,0 @@
-ca.patch
-config-hurd.patch
-debian-targets.patch
-engines-path.patch
-kfreebsd-pipe.patch
-make-targets.patch
-man-dir.patch
-man-section.patch
-no-rpath.patch
-no-symbolic.patch
-pic.patch
-pkg-config.patch
-valgrind.patch
-rc4-amd64.patch
-rehash-crt.patch
-rehash_pod.patch
-shared-lib-ext.patch
-stddef.patch
-version-script.patch
-perl-path.diff
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/shared-lib-ext.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/shared-lib-ext.patch
deleted file mode 100644
index 79eb39f..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/shared-lib-ext.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8k/Configure
-===================================================================
---- openssl-0.9.8k.orig/Configure 2009-07-19 11:36:24.000000000 +0200
-+++ openssl-0.9.8k/Configure 2009-07-19 11:37:03.000000000 +0200
-@@ -1568,7 +1568,8 @@
- elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
- {
- my $sotmp = $1;
-- s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
-+# s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
-+ s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/;
- }
- elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/)
- {
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/stddef.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/stddef.patch
deleted file mode 100644
index 3436b29..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/stddef.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8k/crypto/sha/sha.h
-===================================================================
---- openssl-0.9.8k.orig/crypto/sha/sha.h 2008-09-16 12:47:28.000000000 +0200
-+++ openssl-0.9.8k/crypto/sha/sha.h 2009-07-19 11:36:28.000000000 +0200
-@@ -59,6 +59,7 @@
- #ifndef HEADER_SHA_H
- #define HEADER_SHA_H
-
-+#include <stddef.h>
- #include <openssl/e_os2.h>
- #include <stddef.h>
-
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/version-script.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/version-script.patch
deleted file mode 100644
index 6fa3d75..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/debian/version-script.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Upstream-Status: Backport [debian]
-
-Index: openssl-0.9.8m/Configure
-===================================================================
---- openssl-0.9.8m.orig/Configure 2010-02-27 12:28:32.000000000 +0100
-+++ openssl-0.9.8m/Configure 2010-02-27 12:28:35.000000000 +0100
-@@ -1512,6 +1512,8 @@
- }
- }
-
-+$shared_ldflag .= " -Wl,--version-script=openssl.ld";
-+
- open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n";
- unlink("$Makefile.new") || die "unable to remove old $Makefile.new:$!\n" if -e "$Makefile.new";
- open(OUT,">$Makefile.new") || die "unable to create $Makefile.new:$!\n";
-Index: openssl-0.9.8m/openssl.ld
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ openssl-0.9.8m/openssl.ld 2010-02-27 12:28:35.000000000 +0100
-@@ -0,0 +1,5 @@
-+OPENSSL_0.9.8 {
-+ global:
-+ *;
-+};
-+
-Index: openssl-0.9.8m/engines/openssl.ld
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ openssl-0.9.8m/engines/openssl.ld 2010-02-27 12:28:35.000000000 +0100
-@@ -0,0 +1,5 @@
-+OPENSSL_0.9.8 {
-+ global:
-+ *;
-+};
-+
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/parallel-make-fix.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/parallel-make-fix.patch
deleted file mode 100644
index 82857f5..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/parallel-make-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Upstream-Status: Submitted
-
-fix the parallel build regarding shared libraries.
-
-Signed-off-by: Qing He <qing.he@intel.com>
-
-diff --git a/Makefile.org b/Makefile.org
-index 2fb0309..8bec3d0 100644
---- a/Makefile.org
-+++ b/Makefile.org
-@@ -352,6 +352,9 @@ all_testapps: build_libs build_testapps
- build_testapps:
- @dir=crypto; target=testapps; $(BUILD_ONE_CMD)
-
-+libcrypto.a: build_crypto
-+libssl.a: build_ssl
-+
- build_shared: $(SHARED_LIBS)
- libcrypto$(SHLIB_EXT): libcrypto.a $(SHARED_FIPS)
- @if [ "$(SHLIB_TARGET)" != "" ]; then \
diff --git a/meta/recipes-connectivity/openssl/openssl-0.9.8t/shared-libs.patch b/meta/recipes-connectivity/openssl/openssl-0.9.8t/shared-libs.patch
deleted file mode 100644
index 19de112..0000000
--- a/meta/recipes-connectivity/openssl/openssl-0.9.8t/shared-libs.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-diff --git a/Makefile.org b/Makefile.org
-index e87d623..25ff367 100644
---- a/Makefile.org
-+++ b/Makefile.org
-@@ -355,7 +355,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a $(SHARED_FIPS)
- @if [ "$(SHLIB_TARGET)" != "" ]; then \
- if [ "$(FIPSCANLIB)" = "libfips" ]; then \
- $(ARD) libcrypto.a fipscanister.o ; \
-- $(MAKE) SHLIBDIRS='crypto' SHLIBDEPS='-lfips' build-shared; \
-+ $(MAKE) -e SHLIBDIRS='crypto' SHLIBDEPS='-lfips' build-shared; \
- $(AR) libcrypto.a fips/fipscanister.o ; \
- else \
- if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
-@@ -373,7 +373,7 @@ libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a
- @if [ "$(SHLIB_TARGET)" != "" ]; then \
- shlibdeps=-lcrypto; \
- [ "$(FIPSCANLIB)" = "libfips" ] && shlibdeps="$$shlibdeps -lfips"; \
-- $(MAKE) SHLIBDIRS=ssl SHLIBDEPS="$$shlibdeps" build-shared; \
-+ $(MAKE) -e SHLIBDIRS=ssl SHLIBDEPS="$$shlibdeps" build-shared; \
- else \
- echo "There's no support for shared libraries on this platform" >&2 ; \
- exit 1; \
-diff --git a/crypto/Makefile b/crypto/Makefile
-index 6557f2b..a69bf7c 100644
---- a/crypto/Makefile
-+++ b/crypto/Makefile
-@@ -103,7 +103,7 @@ $(LIB): $(LIBOBJ)
-
- shared: buildinf.h lib subdirs
- if [ -n "$(SHARED_LIBS)" ]; then \
-- (cd ..; $(MAKE) $(SHARED_LIB)); \
-+ (cd ..; $(MAKE) -e $(SHARED_LIB)); \
- fi
-
- libs:
-diff --git a/ssl/Makefile b/ssl/Makefile
-index 5ac3507..77ea2bd 100644
---- a/ssl/Makefile
-+++ b/ssl/Makefile
-@@ -62,7 +62,7 @@ lib: $(LIBOBJ)
-
- shared: lib
- if [ -n "$(SHARED_LIBS)" ]; then \
-- (cd ..; $(MAKE) $(SHARED_LIB)); \
-+ (cd ..; $(MAKE) -e $(SHARED_LIB)); \
- fi
-
- files:
diff --git a/meta/recipes-connectivity/openssl/openssl_0.9.8t.bb b/meta/recipes-connectivity/openssl/openssl_0.9.8t.bb
deleted file mode 100644
index 74892c1..0000000
--- a/meta/recipes-connectivity/openssl/openssl_0.9.8t.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-require openssl.inc
-
-PR = "r0"
-SRC_URI += "file://debian/ca.patch \
- file://debian/config-hurd.patch;apply=no \
- file://debian/debian-targets.patch \
- file://debian/engines-path.patch \
- file://debian/kfreebsd-pipe.patch;apply=no \
- file://debian/make-targets.patch \
- file://debian/man-dir.patch \
- file://debian/man-section.patch \
- file://debian/no-rpath.patch \
- file://debian/no-symbolic.patch \
- file://debian/pic.patch \
- file://debian/pkg-config.patch \
- file://debian/rc4-amd64.patch \
- file://debian/rehash-crt.patch \
- file://debian/rehash_pod.patch \
- file://debian/shared-lib-ext.patch \
- file://debian/stddef.patch \
- file://debian/version-script.patch \
- file://debian/perl-path.diff"
-
-SRC_URI += "file://configure-targets.patch \
- file://shared-libs.patch \
- file://parallel-make-fix.patch"
-
-SRC_URI[md5sum] = "fbf71e8e050bc1ec290b7468bab1a76e"
-SRC_URI[sha256sum] = "edc9639beaf2d5e239d8e5c9d2fe1959e6726a5d7f8ab8430613835f4623f9ba"
-
-BBCLASSEXTEND = "native nativesdk"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 06/35] webkit-gtk: Fix error.html resource path.
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (4 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 05/35] openssl-0.9.8: Remove in favor or 1.0.0 Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 07/35] webkit-gtk: Make webgl support configurable via DISTRO_FEATURES Saul Wold
` (29 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Peter Tworek <tworaz666@gmail.com>
Signed-off-by: Peter Tworek <tworaz666@gmail.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
---
meta/recipes-sato/webkit/webkit-gtk_svn.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-sato/webkit/webkit-gtk_svn.bb b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
index 9652953..d754a39 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_svn.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
@@ -14,7 +14,7 @@ SRCREV_FORMAT = "source"
SRCREV = "101488"
PV = "1.7.2+svnr${SRCPV}"
-PR = "r0"
+PR = "r1"
SRC_URI = "\
svn://svn.webkit.org/repository/webkit/trunk/;module=Source;proto=http;name=source \
@@ -81,7 +81,7 @@ FILES_${PN}launcher = "${bindir}/GtkLauncher"
FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher"
FILES_libjavascriptcore = "${libdir}/libjavascriptcoregtk-1.0.so.*"
FILES_${PN}-webinspector = "${datadir}/webkitgtk-*/webinspector/"
-FILES_${PN} += "${datadir}/webkit-*/resources/error.html \
+FILES_${PN} += "${datadir}/webkitgtk-*/resources/error.html \
${datadir}/webkitgtk-*/images \
${datadir}/glib-2.0/schemas"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 07/35] webkit-gtk: Make webgl support configurable via DISTRO_FEATURES.
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (5 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 06/35] webkit-gtk: Fix error.html resource path Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 08/35] libusb1: Cope with ${libdir} and ${base_libdir} being the same Saul Wold
` (28 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Peter Tworek <tworaz666@gmail.com>
* Add missing dependency on virtual/libgl.
* Make webgl configurable via DISTRO_FEATURES="opengl".
* Run tested on netbook pro.
Signed-off-by: Peter Tworek <tworaz666@gmail.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
---
meta/recipes-sato/webkit/webkit-gtk_svn.bb | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-sato/webkit/webkit-gtk_svn.bb b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
index d754a39..e279ca3 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_svn.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
@@ -8,13 +8,14 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md
file://Source/JavaScriptCore/parser/Parser.h;endline=23;md5=2f3cff0ad0a9c486da5a376928973a90"
DEPENDS = "zlib enchant gnome-keyring libsoup-2.4 curl icu libxml2 cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime sqlite3"
+DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}"
DEPENDS_darwin8 = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer flex-native gperf-native perl-native-runtime sqlite3"
SRCREV_FORMAT = "source"
SRCREV = "101488"
PV = "1.7.2+svnr${SRCPV}"
-PR = "r1"
+PR = "r2"
SRC_URI = "\
svn://svn.webkit.org/repository/webkit/trunk/;module=Source;proto=http;name=source \
@@ -41,6 +42,7 @@ EXTRA_OECONF = "\
--enable-image-resizer \
--enable-link-prefetch \
--with-gtk=2.0 \
+ ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-webgl', '--disable-webgl', d)} \
UNICODE_CFLAGS=-D_REENTRANT \
"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 08/35] libusb1: Cope with ${libdir} and ${base_libdir} being the same
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (6 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 07/35] webkit-gtk: Make webgl support configurable via DISTRO_FEATURES Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 09/35] libusb-compat: " Saul Wold
` (27 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Mike Crowe <mac@mcrowe.com>
${libdir} and ${base_libdir} may be the same. If they are don't try and
move files onto themselves.
Signed-off-by: Mike Crowe <mac@mcrowe.com>
---
meta/recipes-support/libusb/libusb1_1.0.8.bb | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-support/libusb/libusb1_1.0.8.bb b/meta/recipes-support/libusb/libusb1_1.0.8.bb
index 8873de7..e45a9d9 100644
--- a/meta/recipes-support/libusb/libusb1_1.0.8.bb
+++ b/meta/recipes-support/libusb/libusb1_1.0.8.bb
@@ -6,7 +6,7 @@ SECTION = "libs"
LICENSE = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
-PR = "r2"
+PR = "r3"
SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2"
@@ -20,7 +20,9 @@ EXTRA_OECONF = "--libdir=${base_libdir}"
do_install_append() {
install -d ${D}${libdir}
- mv ${D}${base_libdir}/pkgconfig ${D}${libdir}
+ if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
+ mv ${D}${base_libdir}/pkgconfig ${D}${libdir}
+ fi
}
FILES_${PN} += "${base_libdir}/*.so.*"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 09/35] libusb-compat: Cope with ${libdir} and ${base_libdir} being the same
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (7 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 08/35] libusb1: Cope with ${libdir} and ${base_libdir} being the same Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 10/35] libcap: " Saul Wold
` (26 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Mike Crowe <mac@mcrowe.com>
${libdir} and ${base_libdir} may be the same. If they are don't try and
move files onto themselves.
---
meta/recipes-support/libusb/libusb-compat_0.1.3.bb | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-support/libusb/libusb-compat_0.1.3.bb b/meta/recipes-support/libusb/libusb-compat_0.1.3.bb
index 60ebcc2..1595a29 100644
--- a/meta/recipes-support/libusb/libusb-compat_0.1.3.bb
+++ b/meta/recipes-support/libusb/libusb-compat_0.1.3.bb
@@ -15,7 +15,7 @@ DEPENDS = "libusb1"
PROVIDES = "libusb"
PE = "1"
-PR = "r2"
+PR = "r3"
SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2 \
file://0.1.0-beta1-gcc3.4-fix.patch"
@@ -29,7 +29,9 @@ EXTRA_OECONF = "--libdir=${base_libdir}"
do_install_append() {
install -d ${D}${libdir}
- mv ${D}${base_libdir}/pkgconfig ${D}${libdir}
+ if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
+ mv ${D}${base_libdir}/pkgconfig ${D}${libdir}
+ fi
}
FILES_${PN}-dev += "${base_libdir}/*.so"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 10/35] libcap: Cope with ${libdir} and ${base_libdir} being the same
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (8 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 09/35] libusb-compat: " Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 11/35] u-boot inc: update inc file for newer u-boot versions Saul Wold
` (25 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Mike Crowe <mac@mcrowe.com>
${libdir} and ${base_libdir} may be the same. If they are don't try and
move files onto themselves.
Signed-off-by: Mike Crowe <mac@mcrowe.com>
---
meta/recipes-support/libcap/libcap.inc | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc
index 9418abf..5b03671 100644
--- a/meta/recipes-support/libcap/libcap.inc
+++ b/meta/recipes-support/libcap/libcap.inc
@@ -12,6 +12,8 @@ DEPENDS_virtclass-native = "perl-native-runtime"
SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/libcap2/${BPN}-${PV}.tar.bz2"
+PR = "r1"
+
inherit lib_package
do_configure() {
@@ -47,8 +49,10 @@ do_install() {
do_install_append() {
# Move the library to base_libdir
install -d ${D}${base_libdir}
- mv ${D}${libdir}/* ${D}${base_libdir}
- rmdir ${D}${libdir}
+ if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
+ mv ${D}${libdir}/* ${D}${base_libdir}
+ rmdir ${D}${libdir}
+ fi
}
FILES_${PN}-dev += "${base_libdir}/*.so"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 11/35] u-boot inc: update inc file for newer u-boot versions
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (9 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 10/35] libcap: " Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 12/35] systemtap: bump SRCREV to grab version 1.7 Saul Wold
` (24 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Chase Maupin <Chase.Maupin@ti.com>
* Add support for different suffixes found with later u-boot
versions which have switched from .bin to .img
* Allow recipes that include u-boot.inc to also package an
SPL if they build one.
* Minimum requirement is to set the SPL_BINARY value to add
the SPL to the u-boot package as well as into the deploy
directory.
Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
---
meta/recipes-bsp/u-boot/u-boot.inc | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index 4180345..700d5d3 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -19,11 +19,22 @@ python () {
raise bb.parse.SkipPackage("because UBOOT_MACHINE is not set")
}
-UBOOT_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.bin"
-UBOOT_BINARY ?= "u-boot.bin"
-UBOOT_SYMLINK ?= "u-boot-${MACHINE}.bin"
+# Some versions of u-boot use .bin and others use .img. By default use .bin
+# but enable individual recipes to change this value.
+UBOOT_SUFFIX ?= "bin"
+UBOOT_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK ?= "u-boot-${MACHINE}.${UBOOT_SUFFIX}"
UBOOT_MAKE_TARGET ?= "all"
+# Some versions of u-boot build an SPL (Second Program Loader) image that
+# should be packaged along with the u-boot binary as well as placed in the
+# deploy directory. For those versions they can set the following variables
+# to allow packaging the SPL.
+SPL_BINARY ?= ""
+SPL_IMAGE ?= "${SPL_BINARY}-${PV}-${PR}"
+SPL_SYMLINK ?= "${SPL_BINARY}-${MACHINE}"
+
do_compile () {
unset LDFLAGS
unset CFLAGS
@@ -36,15 +47,31 @@ do_install () {
install -d ${D}/boot
install ${S}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE}
ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY}
+
+ if [ "x${SPL_BINARY}" != "x" ]
+ then
+ install ${S}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE}
+ ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARY}
+ fi
}
FILES_${PN} = "/boot"
do_deploy () {
- install ${S}/u-boot.bin ${DEPLOYDIR}/${UBOOT_IMAGE}
+ install -d ${DEPLOYDIR}
+ install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
cd ${DEPLOYDIR}
rm -f ${UBOOT_SYMLINK}
ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK}
+
+ if [ "x${SPL_BINARY}" != "x" ]
+ then
+ install ${S}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE}
+ rm -f ${DEPLOYDIR}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_SYMLINK}
+ ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_BINARY}
+ ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_SYMLINK}
+ fi
}
+
addtask deploy before do_build after do_compile
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 12/35] systemtap: bump SRCREV to grab version 1.7
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (10 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 11/35] u-boot inc: update inc file for newer u-boot versions Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 13/35] systemtap: extend the recipe to build the native package Saul Wold
` (23 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Wade Farnsworth <wade_farnsworth@mentor.com>
Bump SRCREV to the latest stable version of systemtap.
Signed-off-by: Wade Farnsworth <wade_farnsworth@mentor.com>
---
meta/recipes-kernel/systemtap/systemtap_git.bb | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
index ebacc43..dff08ee 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
@@ -4,9 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
DEPENDS = "elfutils sqlite3"
-SRCREV = "820f2d22fc47fad6e09ba886efb9b91e1247cb39"
-PR = "r2"
-PV = "1.6+git${SRCPV}"
+SRCREV = "83bd2699d8cff2f2d6b9eaf5ea254e4cb6b33e81"
+PR = "r0"
+PV = "1.7+git${SRCPV}"
SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 13/35] systemtap: extend the recipe to build the native package
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (11 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 12/35] systemtap: bump SRCREV to grab version 1.7 Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 14/35] systemtap: build and install uprobes.ko Saul Wold
` (22 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Wade Farnsworth <wade_farnsworth@mentor.com>
Since the target image may not contain dev tools, it is useful to
provide native systemtap in order to be able to compile systemtap
scripts for the target.
Signed-off-by: Wade Farnsworth <wade_farnsworth@mentor.com>
---
meta/recipes-kernel/systemtap/systemtap_git.bb | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
index dff08ee..fb3c0ef 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
@@ -2,10 +2,12 @@ DESCRIPTION = "SystemTap - script-directed dynamic tracing and performance analy
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-DEPENDS = "elfutils sqlite3"
+DEPENDS = "elfutils sqlite3 systemtap-native"
+DEPENDS_virtclass-native = "elfutils-native sqlite3-native gettext-native"
+DEPENDS_virtclass-nativesdk = "elfutils-nativesdk sqlite3-nativesdk gettext-nativesdk"
SRCREV = "83bd2699d8cff2f2d6b9eaf5ea254e4cb6b33e81"
-PR = "r0"
+PR = "r1"
PV = "1.7+git${SRCPV}"
SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git"
@@ -28,4 +30,6 @@ S = "${WORKDIR}/git"
inherit autotools gettext
+BBCLASSEXTEND = "native nativesdk"
+
FILES_${PN}-dbg += "${libexecdir}/systemtap/.debug"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 14/35] systemtap: build and install uprobes.ko
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (12 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 13/35] systemtap: extend the recipe to build the native package Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 15/35] udev: stop providing cache support by default Saul Wold
` (21 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Wade Farnsworth <wade_farnsworth@mentor.com>
SystemTap needs to provide uprobes.ko in order to support user space
probing. Build and install the module on systems that support it.
Additionally, split off common bits into systemtap_git.inc.
Signed-off-by: Wade Farnsworth <wade_farnsworth@mentor.com>
---
.../systemtap/systemtap-uprobes_git.bb | 42 ++++++++++++++++++++
meta/recipes-kernel/systemtap/systemtap_git.bb | 18 +-------
meta/recipes-kernel/systemtap/systemtap_git.inc | 16 +++++++
3 files changed, 61 insertions(+), 15 deletions(-)
create mode 100644 meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
create mode 100644 meta/recipes-kernel/systemtap/systemtap_git.inc
diff --git a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
new file mode 100644
index 0000000..7fa6748
--- /dev/null
+++ b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
@@ -0,0 +1,42 @@
+DESCRIPTION = "UProbes kernel module for SystemTap"
+
+require systemtap_git.inc
+
+DEPENDS = "systemtap virtual/kernel"
+
+PR = "r0"
+
+# On systems without CONFIG_UTRACE, this package is empty.
+ALLOW_EMPTY_${PN} = 1
+
+inherit module-base gettext
+
+FILES_${PN} += "${datadir}/systemtap/runtime/uprobes"
+
+EXTRA_OEMAKE = ""
+
+# Compile and install the uprobes kernel module on machines with utrace
+# support. Note that staprun expects it in the systemtap/runtime directory,
+# not in /lib/modules.
+do_compile() {
+ if grep -q "CONFIG_UTRACE=y" ${STAGING_KERNEL_DIR}/.config
+ then
+ unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC LD CPP
+ oe_runmake CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
+ AR="${KERNEL_AR}" \
+ -C ${STAGING_KERNEL_DIR} scripts
+ oe_runmake KDIR=${STAGING_KERNEL_DIR} \
+ M="${S}/runtime/uprobes/" \
+ CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
+ AR="${KERNEL_AR}" \
+ -C "${S}/runtime/uprobes/"
+ fi
+}
+
+do_install() {
+ if [ -e "${S}/runtime/uprobes/uprobes.ko" ]
+ then
+ install -d ${D}/usr/share/systemtap/runtime/uprobes/
+ install -m 0644 ${S}/runtime/uprobes/uprobes.ko ${D}/usr/share/systemtap/runtime/uprobes/
+ fi
+}
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
index fb3c0ef..c4a9d87 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
@@ -1,16 +1,12 @@
DESCRIPTION = "SystemTap - script-directed dynamic tracing and performance analysis tool for Linux"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+require systemtap_git.inc
DEPENDS = "elfutils sqlite3 systemtap-native"
DEPENDS_virtclass-native = "elfutils-native sqlite3-native gettext-native"
DEPENDS_virtclass-nativesdk = "elfutils-nativesdk sqlite3-nativesdk gettext-nativesdk"
-SRCREV = "83bd2699d8cff2f2d6b9eaf5ea254e4cb6b33e81"
-PR = "r1"
-PV = "1.7+git${SRCPV}"
-
-SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git"
+PR = "r2"
EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \
ac_cv_file__usr_include_nss=no \
@@ -20,14 +16,6 @@ EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \
ac_cv_file__usr_include_avahi_client=no \
ac_cv_file__usr_include_avahi_common=no "
-SRC_URI[md5sum] = "cb202866ed704c44a876d041f788bdee"
-SRC_URI[sha256sum] = "8ffe35caec0d937bd23fd78a3a8d94b58907cc0de0330b35e38f9f764815c459"
-
-# systemtap doesn't support mips
-COMPATIBLE_HOST = '(x86_64.*|i.86.*|powerpc.*|arm.*)-linux'
-
-S = "${WORKDIR}/git"
-
inherit autotools gettext
BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
new file mode 100644
index 0000000..cc250ff
--- /dev/null
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -0,0 +1,16 @@
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+SRCREV = "83bd2699d8cff2f2d6b9eaf5ea254e4cb6b33e81"
+PV = "1.7+git${SRCPV}"
+
+SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git"
+
+SRC_URI[md5sum] = "cb202866ed704c44a876d041f788bdee"
+SRC_URI[sha256sum] = "8ffe35caec0d937bd23fd78a3a8d94b58907cc0de0330b35e38f9f764815c459"
+
+# systemtap doesn't support mips
+COMPATIBLE_HOST = '(x86_64.*|i.86.*|powerpc.*|arm.*)-linux'
+
+S = "${WORKDIR}/git"
+
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 15/35] udev: stop providing cache support by default
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (13 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 14/35] systemtap: build and install uprobes.ko Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 16/35] xorg-apps: Bump PR to accomodate meta-oe recipe deletion Saul Wold
` (20 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Otavio Salvador <otavio@ossystems.com.br>
The usefulness of cache nowadays has been reduced a lot and thus it's
better to stop using it by default. Dropping the recommends allows for
image to decide if they want or not to have cache enabled, instead of
require a machine override.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/recipes-core/udev/udev.inc | 2 +-
meta/recipes-core/udev/udev_164.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
index e5fbe40..7949f22 100644
--- a/meta/recipes-core/udev/udev.inc
+++ b/meta/recipes-core/udev/udev.inc
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
DEPENDS = "acl glib-2.0 libusb usbutils pciutils gperf-native libxslt-native"
RPROVIDES_${PN} = "hotplug"
-RRECOMMENDS_${PN} += "udev-extraconf udev-cache usbutils-ids pciutils-ids"
+RRECOMMENDS_${PN} += "udev-extraconf usbutils-ids pciutils-ids"
RDEPENDS_libudev = "${PN} (= ${EXTENDPKGV})"
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
diff --git a/meta/recipes-core/udev/udev_164.bb b/meta/recipes-core/udev/udev_164.bb
index 6d71f4d..b993a13 100644
--- a/meta/recipes-core/udev/udev_164.bb
+++ b/meta/recipes-core/udev/udev_164.bb
@@ -1,6 +1,6 @@
include udev.inc
-PR = "r10"
+PR = "r11"
SRC_URI += "file://udev-166-v4l1-1.patch"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 16/35] xorg-apps: Bump PR to accomodate meta-oe recipe deletion
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (14 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 15/35] udev: stop providing cache support by default Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 17/35] linux-yocto: locate and use out of tree features specified on the SRC_URI Saul Wold
` (19 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
rgb in meta-oe has been removed in favour of
oe-core which requires a PR bump so feeds
keep working
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-graphics/xorg-app/xorg-app-common.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-graphics/xorg-app/xorg-app-common.inc b/meta/recipes-graphics/xorg-app/xorg-app-common.inc
index 86e5c23..890648b 100644
--- a/meta/recipes-graphics/xorg-app/xorg-app-common.inc
+++ b/meta/recipes-graphics/xorg-app/xorg-app-common.inc
@@ -5,7 +5,7 @@ SECTION = "x11/apps"
LICENSE = "MIT-X"
DEPENDS = "util-macros-native virtual/libx11"
-INC_PR = "r5"
+INC_PR = "r7"
SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.bz2"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 17/35] linux-yocto: locate and use out of tree features specified on the SRC_URI
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (15 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 16/35] xorg-apps: Bump PR to accomodate meta-oe recipe deletion Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 18/35] linux-yocto: meta updates for sys940x and cleanup Saul Wold
` (18 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@windriver.com>
In a similar manner to calling the patch.bbclass to locate patches that
were listed on the SRC_URI, it is also useful to query about 'other' items
that are on the SRC_URI. In the case of linux-yocto, it allows us to
know about kernel features that were specific on the URI and then apply
them to the current tree.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/classes/kernel-yocto.bbclass | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 7fdefcf..3130bf4 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -10,6 +10,16 @@ def find_patches(d):
return patch_list
+def find_sccs(d):
+ sources=src_patches(d, True)
+ sources_list=[]
+ for s in sources:
+ base, ext = os.path.splitext(os.path.basename(s))
+ if ext and ext in ('.scc'):
+ sources_list.append(s)
+
+ return sources_list
+
do_patch() {
cd ${S}
if [ -f ${WORKDIR}/defconfig ]; then
@@ -42,6 +52,7 @@ do_patch() {
fi
patches="${@" ".join(find_patches(d))}"
+ sccs="${@" ".join(find_sccs(d))}"
# This loops through all patches, and looks for directories that do
# not already have feature descriptions. If a directory doesn't have
@@ -81,6 +92,16 @@ do_patch() {
fi
done
+ # look for any found scc files, and ensure they are added to the list
+ # of directories passsed to updateme
+ for s in ${sccs}; do
+ sdir=`dirname ${s}`
+ echo ${patch_dirs} | grep -q ${sdir}
+ if [ $? -ne 0 ]; then
+ patch_dirs="${patch_dirs} ${sdir}"
+ fi
+ done
+
# go through the patch directories and look for any scc feature files
# that were constructed above. If one is found, rename it to ".scc" so
# the kernel patching can see it.
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 18/35] linux-yocto: meta updates for sys940x and cleanup
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (16 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 17/35] linux-yocto: locate and use out of tree features specified on the SRC_URI Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 19/35] linux-yocto: rt compiliation fix Saul Wold
` (17 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Updating the meta SRCREV to pickup the following changes:
[
Author: Darren Hart <dvhart@linux.intel.com>
Date: Wed Feb 1 09:37:48 2012 -0800
Remove boot-live cfg duplication from BSPs
Several BSPs duplicated the boot-live fragment in their BSP
specific config. Remove the duplication and add CONFIG_RD_GZIP
and CONFIG_BLK_DEV_SR to the boot-live fragment.
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Acked-by: Tom Zanussi <tzanussi@intel.com>
Author: Darren Hart <dvhart@linux.intel.com>
Date: Tue Jan 31 13:18:17 2012 -0800
meta: sys940x BSP meta data
The Inforce SYS940x-ECX Developer-Ready Reference Platform features:
o Intel Atom E6xx (0.6-1.6 GHz)
o Up to 1GB on-board DDR2
o Intel Platform Controller Hub EG20T
o VGA,LVDS
o HD Audio
o SD Card
o Dual SATA
o Mini-PCIe
http://www.inforcecomputing.com/SYS940X_ECX.html
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Acked-by: Tom Zanussi <tzanussi@intel.com>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
]
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto_3.0.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
index 5402f17..7f902fc 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"
SRCREV_machine ?= "2f9d925f5681eaae7f341cc1270c739e8b329c03"
SRCREV_machine_qemuppc ?= "c66f7ef2315010756c8c97af6b13d52f9f18c03b"
-SRCREV_meta ?= "59314a3523e360796419d76d78c6f7d8c5ef2593"
+SRCREV_meta ?= "77ca4855e80acb8dad21acea946908716c308b5b"
PR = "r1"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
index 6ff6027..f7bb0d4 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
@@ -18,7 +18,7 @@ SRCREV_machine_qemuppc ?= "15fd748017f0849138ff4b47d73f6866fa26cfe8"
SRCREV_machine_qemux86 ?= "8f74a4339b3dc029fafff0ba7d88d6dc950d4b31"
SRCREV_machine_qemux86-64 ?= "610c5a62daeda033755b0b7bfcb3e2cad5c76f3f"
SRCREV_machine ?= "5df0b4c2538399aed543133b3855f809adf08ab8"
-SRCREV_meta ?= "59314a3523e360796419d76d78c6f7d8c5ef2593"
+SRCREV_meta ?= "77ca4855e80acb8dad21acea946908716c308b5b"
PR = "r3"
PV = "${LINUX_VERSION}+git${SRCPV}"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 19/35] linux-yocto: rt compiliation fix
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (17 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 18/35] linux-yocto: meta updates for sys940x and cleanup Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 20/35] kern-tools: remove explicit 'yocto' references from auto-bsp handling Saul Wold
` (16 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Updating the meta SRCREC to pickup the following changes:
70e86dc meta/rt: update rt patch cache
Without this change a 3.0 based -rt build will fail to patch.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto_3.0.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
index 7f902fc..d7e4e7a 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"
SRCREV_machine ?= "2f9d925f5681eaae7f341cc1270c739e8b329c03"
SRCREV_machine_qemuppc ?= "c66f7ef2315010756c8c97af6b13d52f9f18c03b"
-SRCREV_meta ?= "77ca4855e80acb8dad21acea946908716c308b5b"
+SRCREV_meta ?= "70e86dc937a40c0dc7c84549de0e86bb09f12da3"
PR = "r1"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
index f7bb0d4..67f8da1 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
@@ -18,7 +18,7 @@ SRCREV_machine_qemuppc ?= "15fd748017f0849138ff4b47d73f6866fa26cfe8"
SRCREV_machine_qemux86 ?= "8f74a4339b3dc029fafff0ba7d88d6dc950d4b31"
SRCREV_machine_qemux86-64 ?= "610c5a62daeda033755b0b7bfcb3e2cad5c76f3f"
SRCREV_machine ?= "5df0b4c2538399aed543133b3855f809adf08ab8"
-SRCREV_meta ?= "77ca4855e80acb8dad21acea946908716c308b5b"
+SRCREV_meta ?= "70e86dc937a40c0dc7c84549de0e86bb09f12da3"
PR = "r3"
PV = "${LINUX_VERSION}+git${SRCPV}"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 20/35] kern-tools: remove explicit 'yocto' references from auto-bsp handling
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (18 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 19/35] linux-yocto: rt compiliation fix Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 21/35] linux-yocto: fri2: use emgd-1.10 Saul Wold
` (15 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@windriver.com>
To adapt to different branch names in a repository, removing explicit
references to 'yocto' in automatically created BSPs ensures that they
are consistent with the merged variants. Existing BSPs and auto BSPs
are not impacted by this change.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
.../kern-tools/kern-tools-native_git.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
index 1eced23..14ec9e9 100644
--- a/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
+++ b/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=e2bf4415f3d8
DEPENDS = "git-native guilt-native"
-SRCREV = "a7a9930d2b1f1954fbd817810b706e2e3c42e8de"
+SRCREV = "91c2b184be90d6654996887203efdd7f1727a19a"
PR = r12
PV = "0.1+git${SRCPV}"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 21/35] linux-yocto: fri2: use emgd-1.10
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (19 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 20/35] kern-tools: remove explicit 'yocto' references from auto-bsp handling Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 22/35] task-core-tools: Divide it into 3 recipes Saul Wold
` (14 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Updating meta for the following change:
[
fri2: use emgd-1.10
Use the yocto/emgd-1.10 branch in place of yocto/emgd.
]
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto_3.0.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
index d7e4e7a..b947a48 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"
SRCREV_machine ?= "2f9d925f5681eaae7f341cc1270c739e8b329c03"
SRCREV_machine_qemuppc ?= "c66f7ef2315010756c8c97af6b13d52f9f18c03b"
-SRCREV_meta ?= "70e86dc937a40c0dc7c84549de0e86bb09f12da3"
+SRCREV_meta ?= "b78a519841bd8b477cad599af8d38df6760445c1"
PR = "r1"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
index 67f8da1..44a9fe4 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
@@ -18,7 +18,7 @@ SRCREV_machine_qemuppc ?= "15fd748017f0849138ff4b47d73f6866fa26cfe8"
SRCREV_machine_qemux86 ?= "8f74a4339b3dc029fafff0ba7d88d6dc950d4b31"
SRCREV_machine_qemux86-64 ?= "610c5a62daeda033755b0b7bfcb3e2cad5c76f3f"
SRCREV_machine ?= "5df0b4c2538399aed543133b3855f809adf08ab8"
-SRCREV_meta ?= "70e86dc937a40c0dc7c84549de0e86bb09f12da3"
+SRCREV_meta ?= "b78a519841bd8b477cad599af8d38df6760445c1"
PR = "r3"
PV = "${LINUX_VERSION}+git${SRCPV}"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 22/35] task-core-tools: Divide it into 3 recipes
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (20 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 21/35] linux-yocto: fri2: use emgd-1.10 Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 23/35] Enable options needed for ltp to compile Saul Wold
` (13 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
task-core-tools-debug, task-core-tools-profile, task-core-tools-testapps
otherwise if we choose one through PACKAGE_GROUPS all packages
are built since they are in same recipe.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 26 +++++--
meta/conf/multilib.conf | 4 +-
meta/recipes-core/tasks/task-core-tools-debug.bb | 26 ++++++
...sk-core-tools.bb => task-core-tools-profile.bb} | 81 ++++++--------------
.../recipes-core/tasks/task-core-tools-testapps.bb | 46 +++++++++++
5 files changed, 119 insertions(+), 64 deletions(-)
create mode 100644 meta/recipes-core/tasks/task-core-tools-debug.bb
rename meta/recipes-core/tasks/{task-core-tools.bb => task-core-tools-profile.bb} (48%)
create mode 100644 meta/recipes-core/tasks/task-core-tools-testapps.bb
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 42f7e65..09b5bfc 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -2467,12 +2467,26 @@ RECIPE_LATEST_RELEASE_DATE_pn-task-core-nfs="n/a"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-nfs="n/a"
RECIPE_MAINTAINER_pn-task-core-nfs = "Dongxiao Xu <dongxiao.xu@intel.com>"
-RECIPE_STATUS_pn-task-core-tools="green"
-RECIPE_LATEST_VERSION_pn-task-core-tools="1.0"
-RECIPE_NO_OF_PATCHES_pn-task-core-tools="0"
-RECIPE_LATEST_RELEASE_DATE_pn-task-core-tools="n/a"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-tools="n/a"
-RECIPE_MAINTAINER_pn-task-core-tools = "Dongxiao Xu <dongxiao.xu@intel.com>"
+RECIPE_STATUS_pn-task-core-tools-debug="green"
+RECIPE_LATEST_VERSION_pn-task-core-tools-debug="1.0"
+RECIPE_NO_OF_PATCHES_pn-task-core-tools-debug="0"
+RECIPE_LATEST_RELEASE_DATE_pn-task-core-tools-debug="n/a"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-tools-debug="n/a"
+RECIPE_MAINTAINER_pn-task-core-tools-profile = "Dongxiao Xu <dongxiao.xu@intel.com>"
+
+RECIPE_STATUS_pn-task-core-tools-profile="green"
+RECIPE_LATEST_VERSION_pn-task-core-tools-profile="1.0"
+RECIPE_NO_OF_PATCHES_pn-task-core-tools-profile="0"
+RECIPE_LATEST_RELEASE_DATE_pn-task-core-tools-profile="n/a"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-tools-profile="n/a"
+RECIPE_MAINTAINER_pn-task-core-tools-profile = "Dongxiao Xu <dongxiao.xu@intel.com>"
+
+RECIPE_STATUS_pn-task-core-tools-testapps="green"
+RECIPE_LATEST_VERSION_pn-task-core-tools-testapps="1.0"
+RECIPE_NO_OF_PATCHES_pn-task-core-tools-testapps="0"
+RECIPE_LATEST_RELEASE_DATE_pn-task-core-tools-testapps="n/a"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-task-core-tools-testapps="n/a"
+RECIPE_MAINTAINER_pn-task-core-tools-testapps = "Dongxiao Xu <dongxiao.xu@intel.com>"
RECIPE_STATUS_pn-gst-meta-base="green"
DISTRO_PN_ALIAS_pn-gst-meta-base = "Meego=gstreamer Fedora=gstreamer OpenSuSE=gstreamer Ubuntu=gstreamer0.10 Mandriva=gstreamer0.10 Debian=gstreamer0.10"
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 9554519..d366fd3 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -393,7 +393,9 @@ BBCLASSEXTEND_append_pn-task-core-lsb = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-task-core-nfs = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-task-core-ssh-dropbear = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-task-core-ssh-openssh = " ${MULTILIBS}"
-BBCLASSEXTEND_append_pn-task-core-tools = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-task-core-tools-debug = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-task-core-tools-profile = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-task-core-tools-testapps = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-task-core-x11 = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-task-core-x11-sato = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-tasks = " ${MULTILIBS}"
diff --git a/meta/recipes-core/tasks/task-core-tools-debug.bb b/meta/recipes-core/tasks/task-core-tools-debug.bb
new file mode 100644
index 0000000..3c92f3f
--- /dev/null
+++ b/meta/recipes-core/tasks/task-core-tools-debug.bb
@@ -0,0 +1,26 @@
+#
+# Copyright (C) 2008 OpenedHand Ltd.
+#
+
+DESCRIPTION = "Debug tools tasks for OE-Core"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+PACKAGES = "\
+ ${PN} \
+ ${PN}-dbg \
+ ${PN}-dev \
+ "
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+ALLOW_EMPTY = "1"
+
+RDEPENDS_${PN} = "\
+ gdb \
+ gdbserver \
+ tcf-agent \
+ rsync \
+ strace \
+ "
diff --git a/meta/recipes-core/tasks/task-core-tools.bb b/meta/recipes-core/tasks/task-core-tools-profile.bb
similarity index 48%
rename from meta/recipes-core/tasks/task-core-tools.bb
rename to meta/recipes-core/tasks/task-core-tools-profile.bb
index 1a42f15..254d3f5 100644
--- a/meta/recipes-core/tasks/task-core-tools.bb
+++ b/meta/recipes-core/tasks/task-core-tools-profile.bb
@@ -2,42 +2,30 @@
# Copyright (C) 2008 OpenedHand Ltd.
#
-DESCRIPTION = "Tools tasks for OE-Core"
+DESCRIPTION = "Profile tools tasks for OE-Core"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r15"
PACKAGES = "\
- task-core-tools-debug \
- task-core-tools-debug-dbg \
- task-core-tools-debug-dev \
- task-core-tools-profile \
- task-core-tools-profile-dbg \
- task-core-tools-profile-dev \
- task-core-tools-testapps \
- task-core-tools-testapps-dbg \
- task-core-tools-testapps-dev \
+ ${PN} \
+ ${PN}-dbg \
+ ${PN}-dev \
"
PACKAGE_ARCH = "${MACHINE_ARCH}"
ALLOW_EMPTY = "1"
-# kexec-tools doesn't work on Mips
-KEXECTOOLS ?= "kexec"
-KEXECTOOLS_mips ?= ""
-KEXECTOOLS_mipsel ?= ""
-KEXECTOOLS_powerpc ?= ""
-
-RDEPENDS_task-core-tools-debug = "\
- gdb \
- gdbserver \
- tcf-agent \
- rsync \
- strace"
+RRECOMMENDS_${PN} = "\
+ perf \
+ trace-cmd \
+ kernel-module-oprofile \
+ blktrace \
+ sysprof \
+ "
-RDEPENDS_task-core-tools-profile = "\
+PROFILETOOLS = "\
oprofile \
oprofileui-server \
powertop \
@@ -45,14 +33,6 @@ RDEPENDS_task-core-tools-profile = "\
lttng-control \
lttng-viewer"
-RRECOMMENDS_task-core-tools-profile = "\
- perf \
- trace-cmd \
- kernel-module-oprofile \
- blktrace \
- sysprof \
- "
-
# systemtap needs elfutils which is not fully buildable on uclibc
# hence we exclude it from uclibc based builds
SYSTEMTAP = "systemtap"
@@ -66,6 +46,13 @@ SYSTEMTAP_libc-uclibc = ""
LTTNGUST = "lttng-ust"
LTTNGUST_libc-uclibc = ""
+LTTNGUST_mips = ""
+
+# valgrind does not work on mips
+
+VALGRIND = "valgrind"
+VALGRIND_libc-uclibc = ""
+VALGRIND_mips = ""
# exmap-console
# exmap-server
@@ -74,29 +61,9 @@ LTTNGUST_libc-uclibc = ""
# qemux86/qemux86-64/qemuppc/qemuarm/emenlow/atom-pc since upstream liburcu
# (which is required by lttng-ust) may not build on other platforms, like
# MIPS.
-RDEPENDS_task-core-tools-profile_append_qemux86 = " valgrind lttng-ust ${SYSTEMTAP}"
-RDEPENDS_task-core-tools-profile_append_qemux86-64 = " ${LTTNGUST} ${SYSTEMTAP}"
-RDEPENDS_task-core-tools-profile_append_qemuppc = " ${LTTNGUST} ${SYSTEMTAP}"
-RDEPENDS_task-core-tools-profile_append_qemuarm = " ${LTTNGUST} ${SYSTEMTAP}"
-
-RDEPENDS_task-core-tools-testapps = "\
- blktool \
- fstests \
- tslib-calibrate \
- tslib-tests \
- lrzsz \
- ${KEXECTOOLS} \
- alsa-utils-amixer \
- alsa-utils-aplay \
- owl-video \
- gst-meta-video \
- gst-meta-audio \
- mesa-demos \
- x11perf \
- xrestop \
- xwininfo \
- xprop \
- xvideo-tests \
- clutter-box2d \
- ltp \
+RDEPENDS_${PN} = "\
+ ${PROFILETOOLS} \
+ ${LTTNGUST} \
+ ${SYSTEMTAP} \
+ ${VALGRIND} \
"
diff --git a/meta/recipes-core/tasks/task-core-tools-testapps.bb b/meta/recipes-core/tasks/task-core-tools-testapps.bb
new file mode 100644
index 0000000..b5847f8
--- /dev/null
+++ b/meta/recipes-core/tasks/task-core-tools-testapps.bb
@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2008 OpenedHand Ltd.
+#
+
+DESCRIPTION = "Test apps task for OE-Core"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
+PACKAGES = "\
+ ${PN} \
+ ${PN}-dbg \
+ ${PN}-dev \
+ "
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+ALLOW_EMPTY = "1"
+
+# kexec-tools doesn't work on Mips
+KEXECTOOLS ?= "kexec"
+KEXECTOOLS_mips ?= ""
+KEXECTOOLS_mipsel ?= ""
+KEXECTOOLS_powerpc ?= ""
+
+RDEPENDS_${PN} = "\
+ blktool \
+ fstests \
+ tslib-calibrate \
+ tslib-tests \
+ lrzsz \
+ ${KEXECTOOLS} \
+ alsa-utils-amixer \
+ alsa-utils-aplay \
+ owl-video \
+ gst-meta-video \
+ gst-meta-audio \
+ mesa-demos \
+ x11perf \
+ xrestop \
+ xwininfo \
+ xprop \
+ xvideo-tests \
+ clutter-box2d \
+ ltp \
+ "
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 23/35] Enable options needed for ltp to compile
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (21 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 22/35] task-core-tools: Divide it into 3 recipes Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 24/35] runqemu-internal: qemuarm can handle 256M Saul Wold
` (12 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-core/uclibc/uclibc-git/uClibc.distro | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-core/uclibc/uclibc-git/uClibc.distro b/meta/recipes-core/uclibc/uclibc-git/uClibc.distro
index 3948d1a..c33bf8e 100644
--- a/meta/recipes-core/uclibc/uclibc-git/uClibc.distro
+++ b/meta/recipes-core/uclibc/uclibc-git/uClibc.distro
@@ -183,3 +183,8 @@ UCLIBC_HAS_FLOATS=y
UCLIBC_HAS_UTMPX=y
UCLIBC_LINUX_MODULE_26=y
UCLIBC_HAS_RESOLVER_SUPPORT=y
+# needed for LTP
+UCLIBC_SUSV4_LEGACY=y
+UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=y
+DO_XSI_MATH=y
+UCLIBC_SV4_DEPRECATED=y
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 24/35] runqemu-internal: qemuarm can handle 256M
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (22 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 23/35] Enable options needed for ltp to compile Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 25/35] gconf, consolekit: Avoid polkit when compiling with uclibc Saul Wold
` (11 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
Raise the check for max RAM supported for QEMU/arm
its 256M since we patched it to be so in OE
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
scripts/runqemu-internal | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 21fbce3..73b8b41 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -67,13 +67,14 @@ fi
# QEMU_MEMORY has 'M' appended to mem_size
QEMU_MEMORY="$mem_size"M
-# Bug 433: qemuarm cannot use > 128 MB RAM
+# Bug 433: qemuarm cannot use > 256 MB RAM
if [ "$MACHINE" = "qemuarm" ]; then
- if [[ -z "$mem_size" || $mem_size -gt 128 ]]; then
- echo "WARNING: qemuarm does not support > 128M of RAM."
- echo "Changing QEMU_MEMORY to default of 128M."
- QEMU_MEMORY="128M"
- SCRIPT_QEMU_EXTRA_OPT=`echo $SCRIPT_QEMU_EXTRA_OPT | sed -e "s/$mem_set/-m 128/" `
+ if [[ -z "$mem_size" || $mem_size -gt 256 ]]; then
+ echo "WARNING: qemuarm does not support > 256M of RAM."
+ echo "Changing QEMU_MEMORY to default of 256M."
+ QEMU_MEMORY="256M"
+ mem_size="256"
+ SCRIPT_QEMU_EXTRA_OPT=`echo $SCRIPT_QEMU_EXTRA_OPT | sed -e "s/$mem_set/-m 256/" `
fi
fi
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 25/35] gconf, consolekit: Avoid polkit when compiling with uclibc
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (23 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 24/35] runqemu-internal: qemuarm can handle 256M Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 26/35] python: Fix build failure of python-elementtree on x86_64 Saul Wold
` (10 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
polkit uses netdb functionality from glibc which is not
available in uclibc therefore we avoid polkit when compiling
for uclibc systems.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-gnome/gnome/gconf_3.2.3.bb | 9 +++++++--
.../recipes-support/consolekit/consolekit_0.4.5.bb | 11 ++++++++---
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.3.bb b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
index 412f01c..a0b8d0c 100644
--- a/meta/recipes-gnome/gnome/gconf_3.2.3.bb
+++ b/meta/recipes-gnome/gnome/gconf_3.2.3.bb
@@ -3,10 +3,13 @@ SECTION = "x11/gnome"
LICENSE = "LGPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605"
-DEPENDS = "glib-2.0 gtk+ dbus dbus-glib libxml2 intltool-native polkit"
+POLKIT = "polkit"
+POLKIT_libc-uclibc = ""
+
+DEPENDS = "glib-2.0 gtk+ dbus dbus-glib libxml2 intltool-native ${POLKIT}"
DEPENDS_virtclass-native = "glib-2.0-native dbus-native dbus-glib-native libxml2-native intltool-native gnome-common-native"
-PR = "r5"
+PR = "r6"
inherit gnomebase
@@ -21,6 +24,8 @@ S = "${WORKDIR}/GConf-${PV}"
POLKIT_OECONF = "--enable-defaults-service"
POLKIT_OECONF_virtclass-native = "--disable-defaults-service"
+POLKIT_OECONF_libc-uclibc = "--disable-default-service"
+
GTKOECONF = "--with-gtk=2.0 --enable-gtk"
GTKOECONF_virtclass-native = "--disable-gtk"
EXTRA_OECONF = "--disable-gtk-doc --enable-shared --disable-static --enable-debug=yes \
diff --git a/meta/recipes-support/consolekit/consolekit_0.4.5.bb b/meta/recipes-support/consolekit/consolekit_0.4.5.bb
index 45f6ad3..3ded6df 100644
--- a/meta/recipes-support/consolekit/consolekit_0.4.5.bb
+++ b/meta/recipes-support/consolekit/consolekit_0.4.5.bb
@@ -2,13 +2,18 @@ DESCRIPTION = "ConsoleKit is a framework for defining and tracking users, login
HOMEPAGE="http://www.freedesktop.org/wiki/Software/ConsoleKit"
BUGTRACKER="https://bugs.freedesktop.org/buglist.cgi?query_format=specific&product=ConsoleKit"
-PR = "r7"
+PR = "r8"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
file://src/main.c;endline=21;md5=0a994e09769780220163255d8f9071c3"
-DEPENDS = "glib-2.0 dbus polkit ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
+POLKIT = "polkit"
+POLKIT_libc-uclibc = ""
+POLKITCONF = ""
+POLKITCONF_libc-uclibc = "--disable-policykit"
+
+DEPENDS = "glib-2.0 dbus ${POLKIT} ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
RDEPENDS_${PN} += "base-files"
inherit gnome
@@ -20,7 +25,7 @@ SRC_URI[sha256sum] = "43e0780c53078e125efcec3f847e484dc3533e49b408ce6a0ab1b22368
S = "${WORKDIR}/ConsoleKit-${PV}"
-EXTRA_OECONF = "--with-systemdsystemunitdir=${base_libdir}/systemd/system/ \
+EXTRA_OECONF = "${POLKITCONF} --with-systemdsystemunitdir=${base_libdir}/systemd/system/ \
${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam-module --with-pam-module-dir=${base_libdir}/security', '--disable-pam-module', d)} \
"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 26/35] python: Fix build failure of python-elementtree on x86_64
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (24 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 25/35] gconf, consolekit: Avoid polkit when compiling with uclibc Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 27/35] libdrm: Fix build failure unearthed by uclibc Saul Wold
` (9 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
The problem is due to mixing of headers from host system
thusly corrected in setup.py by checkinng if we are cross
compiling
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../python/python/host_include_contamination.patch | 27 ++++++++++++++++++++
meta/recipes-devtools/python/python_2.7.2.bb | 3 +-
2 files changed, 29 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-devtools/python/python/host_include_contamination.patch
diff --git a/meta/recipes-devtools/python/python/host_include_contamination.patch b/meta/recipes-devtools/python/python/host_include_contamination.patch
new file mode 100644
index 0000000..62cb8b1
--- /dev/null
+++ b/meta/recipes-devtools/python/python/host_include_contamination.patch
@@ -0,0 +1,27 @@
+when building python for qemux86-64 on ubuntu 11.10/64bit
+it gropes into host includes and then mixes them with cross
+includes and as a result some modules fail to compile and link
+one of the modules is python-elementtree which is then not
+found during image creation
+
+Proble is that setup.py tries to add native includes that newer
+ubuntu has introduced for multiarch support. But that should
+only happen for native builds and not cross building python
+so we add a check here.
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Pending
+
+Index: Python-2.7.2/setup.py
+===================================================================
+--- Python-2.7.2.orig/setup.py 2012-02-03 12:10:42.307057756 -0800
++++ Python-2.7.2/setup.py 2012-02-03 12:11:12.363059210 -0800
+@@ -360,6 +360,8 @@
+ # https://wiki.ubuntu.com/MultiarchSpec
+ if not find_executable('dpkg-architecture'):
+ return
++ if os.environ.get('CROSS_COMPILE') is not None:
++ return
+ tmpfile = os.path.join(self.build_temp, 'multiarch')
+ if not os.path.exists(self.build_temp):
+ os.makedirs(self.build_temp)
diff --git a/meta/recipes-devtools/python/python_2.7.2.bb b/meta/recipes-devtools/python/python_2.7.2.bb
index 654c850..fb5e860 100644
--- a/meta/recipes-devtools/python/python_2.7.2.bb
+++ b/meta/recipes-devtools/python/python_2.7.2.bb
@@ -1,7 +1,7 @@
require python.inc
DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib"
DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
-PR = "${INC_PR}.5"
+PR = "${INC_PR}.6"
DISTRO_SRC_URI ?= "file://sitecustomize.py"
DISTRO_SRC_URI_linuxstdbase = ""
@@ -20,6 +20,7 @@ SRC_URI += "\
file://remove_sqlite_rpath.patch \
file://setup_py_skip_cross_import_check.patch \
file://add-md5module-support.patch \
+ file://host_include_contamination.patch \
"
S = "${WORKDIR}/Python-${PV}"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 27/35] libdrm: Fix build failure unearthed by uclibc
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (25 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 26/35] python: Fix build failure of python-elementtree on x86_64 Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 28/35] libx11: Backport _XGetRequest API Saul Wold
` (8 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
uclibc wants to know value of __USE_GNU for certain
header prototypes to be enabled. So we move the config.h
header up in search list.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../drm/libdrm/GNU_SOURCE_definition.patch | 30 ++++++++++++++++++++
meta/recipes-graphics/drm/libdrm_2.4.30.bb | 6 ++-
2 files changed, 34 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-graphics/drm/libdrm/GNU_SOURCE_definition.patch
diff --git a/meta/recipes-graphics/drm/libdrm/GNU_SOURCE_definition.patch b/meta/recipes-graphics/drm/libdrm/GNU_SOURCE_definition.patch
new file mode 100644
index 0000000..8eb1d5e
--- /dev/null
+++ b/meta/recipes-graphics/drm/libdrm/GNU_SOURCE_definition.patch
@@ -0,0 +1,30 @@
+uclibc headers need to know if _GNU_SOURCE is defined or not and its defined
+in config.h so include it first to get the definition if its there fixed build
+problems on uclibc
+
+test_decode.c:107:2: error: implicit declaration of function 'open_memstream' [-Werror=implicit-function-declaration]
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Pending
+
+Index: libdrm-2.4.30/intel/test_decode.c
+===================================================================
+--- libdrm-2.4.30.orig/intel/test_decode.c 2012-02-03 14:28:46.409355918 -0800
++++ libdrm-2.4.30/intel/test_decode.c 2012-02-03 14:29:02.357356689 -0800
+@@ -21,6 +21,8 @@
+ * IN THE SOFTWARE.
+ */
+
++#include "config.h"
++
+ #include <string.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+@@ -31,7 +33,6 @@
+ #include <sys/mman.h>
+ #include <err.h>
+
+-#include "config.h"
+ #include "intel_bufmgr.h"
+ #include "intel_chipset.h"
+
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.30.bb b/meta/recipes-graphics/drm/libdrm_2.4.30.bb
index 4a6052d..5d99916 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.30.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.30.bb
@@ -2,9 +2,11 @@ require libdrm.inc
LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71"
-PR = "r0"
+PR = "r1"
-SRC_URI += "file://installtests.patch"
+SRC_URI += "file://installtests.patch \
+ file://GNU_SOURCE_definition.patch \
+ "
SRC_URI[md5sum] = "9f57a68b2c0836b55ebcbc241f6ca175"
SRC_URI[sha256sum] = "cacea9c157ec824ad278a06f4910659b2f3ae69686518ece8d6967843cddcd56"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 28/35] libx11: Backport _XGetRequest API
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (26 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 27/35] libdrm: Fix build failure unearthed by uclibc Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 29/35] mtools-3.9.9: Use correct URI for the mirror Saul Wold
` (7 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
This API is relatively new and will be in next release of libX11
this is needed for OE qemu-native which links to libx11-native
but uses libGL from build system and herein lies the problem
if you have bleeding edge distro e.g. ubuntu 12.04(development)
libGL.so expects this API to be present. Backported to 1.4.4
thusly
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
...quest-as-substitute-for-GetReq-GetReqExtr.patch | 137 ++++++++++++++++++++
meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb | 3 +
2 files changed, 140 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.4.4/0001-Add-_XGetRequest-as-substitute-for-GetReq-GetReqExtr.patch
diff --git a/meta/recipes-graphics/xorg-lib/libx11-1.4.4/0001-Add-_XGetRequest-as-substitute-for-GetReq-GetReqExtr.patch b/meta/recipes-graphics/xorg-lib/libx11-1.4.4/0001-Add-_XGetRequest-as-substitute-for-GetReq-GetReqExtr.patch
new file mode 100644
index 0000000..aedb5c4
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-1.4.4/0001-Add-_XGetRequest-as-substitute-for-GetReq-GetReqExtr.patch
@@ -0,0 +1,137 @@
+From 4a060f993bf676cf21ad9784e010f54134da7b40 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon, 17 Oct 2011 09:45:15 +1000
+Subject: [PATCH] Add _XGetRequest as substitute for GetReq/GetReqExtra
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+Reviewed-by: Jamey Sharp <jamey@minilop.net>
+---
+ include/X11/Xlibint.h | 49 ++++++++++++++++---------------------------------
+ src/XlibInt.c | 31 +++++++++++++++++++++++++++++++
+ 2 files changed, 47 insertions(+), 33 deletions(-)
+
+Upstream-Status: Backport
+
+diff --git a/include/X11/Xlibint.h b/include/X11/Xlibint.h
+index 2ce356d..43d1f2a 100644
+--- a/include/X11/Xlibint.h
++++ b/include/X11/Xlibint.h
+@@ -420,6 +420,18 @@ extern LockInfoPtr _Xglobal_lock;
+ #define WORD64ALIGN
+ #endif /* WORD64 */
+
++/**
++ * Return a len-sized request buffer for the request type. This function may
++ * flush the output queue.
++ *
++ * @param dpy The display connection
++ * @param type The request type
++ * @param len Length of the request in bytes
++ *
++ * @returns A pointer to the request buffer with a few default values
++ * initialized.
++ */
++extern void *_XGetRequest(Display *dpy, CARD8 type, size_t len);
+
+ /*
+ * GetReq - Get the next available X request packet in the buffer and
+@@ -432,25 +444,10 @@ extern LockInfoPtr _Xglobal_lock;
+
+ #if !defined(UNIXCPP) || defined(ANSICPP)
+ #define GetReq(name, req) \
+- WORD64ALIGN\
+- if ((dpy->bufptr + SIZEOF(x##name##Req)) > dpy->bufmax)\
+- _XFlush(dpy);\
+- req = (x##name##Req *)(dpy->last_req = dpy->bufptr);\
+- req->reqType = X_##name;\
+- req->length = (SIZEOF(x##name##Req))>>2;\
+- dpy->bufptr += SIZEOF(x##name##Req);\
+- dpy->request++
+-
++ req = (x##name##Req *) _XGetRequest(dpy, X_##name, SIZEOF(x##name##Req))
+ #else /* non-ANSI C uses empty comment instead of "##" for token concatenation */
+ #define GetReq(name, req) \
+- WORD64ALIGN\
+- if ((dpy->bufptr + SIZEOF(x/**/name/**/Req)) > dpy->bufmax)\
+- _XFlush(dpy);\
+- req = (x/**/name/**/Req *)(dpy->last_req = dpy->bufptr);\
+- req->reqType = X_/**/name;\
+- req->length = (SIZEOF(x/**/name/**/Req))>>2;\
+- dpy->bufptr += SIZEOF(x/**/name/**/Req);\
+- dpy->request++
++ req = (x/**/name/**/Req *) _XGetRequest(dpy, X_/**/name, SIZEOF(x/**/name/**/Req))
+ #endif
+
+ /* GetReqExtra is the same as GetReq, but allocates "n" additional
+@@ -458,24 +455,10 @@ extern LockInfoPtr _Xglobal_lock;
+
+ #if !defined(UNIXCPP) || defined(ANSICPP)
+ #define GetReqExtra(name, n, req) \
+- WORD64ALIGN\
+- if ((dpy->bufptr + SIZEOF(x##name##Req) + n) > dpy->bufmax)\
+- _XFlush(dpy);\
+- req = (x##name##Req *)(dpy->last_req = dpy->bufptr);\
+- req->reqType = X_##name;\
+- req->length = (SIZEOF(x##name##Req) + n)>>2;\
+- dpy->bufptr += SIZEOF(x##name##Req) + n;\
+- dpy->request++
++ req = (x##name##Req *) _XGetRequest(dpy, X_##name, SIZEOF(x##name##Req) + n)
+ #else
+ #define GetReqExtra(name, n, req) \
+- WORD64ALIGN\
+- if ((dpy->bufptr + SIZEOF(x/**/name/**/Req) + n) > dpy->bufmax)\
+- _XFlush(dpy);\
+- req = (x/**/name/**/Req *)(dpy->last_req = dpy->bufptr);\
+- req->reqType = X_/**/name;\
+- req->length = (SIZEOF(x/**/name/**/Req) + n)>>2;\
+- dpy->bufptr += SIZEOF(x/**/name/**/Req) + n;\
+- dpy->request++
++ req = (x/**/name/**/Req *) _XGetRequest(dpy, X_/**/name, SIZEOF(x/**/name/**/Req) + n)
+ #endif
+
+
+diff --git a/src/XlibInt.c b/src/XlibInt.c
+index 3db151e..a8f5d08 100644
+--- a/src/XlibInt.c
++++ b/src/XlibInt.c
+@@ -1956,6 +1956,37 @@ Screen *_XScreenOfWindow(Display *dpy, Window w)
+ }
+
+
++/*
++ * WARNING: This implementation's pre-conditions and post-conditions
++ * must remain compatible with the old macro-based implementations of
++ * GetReq, GetReqExtra, GetResReq, and GetEmptyReq. The portions of the
++ * Display structure affected by those macros are part of libX11's
++ * ABI.
++ */
++void *_XGetRequest(Display *dpy, CARD8 type, size_t len)
++{
++ xReq *req;
++
++ WORD64ALIGN
++
++ if (dpy->bufptr + len > dpy->bufmax)
++ _XFlush(dpy);
++
++ if (len % 4)
++ fprintf(stderr,
++ "Xlib: request %d length %zd not a multiple of 4.\n",
++ type, len);
++
++ dpy->last_req = dpy->bufptr;
++
++ req = (xReq*)dpy->bufptr;
++ req->reqType = type;
++ req->length = len / 4;
++ dpy->bufptr += len;
++ dpy->request++;
++ return req;
++}
++
+ #if defined(WIN32)
+
+ /*
+--
+1.7.8.3
+
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb b/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb
index 823b3dc..ee1d919 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb
@@ -1,6 +1,8 @@
require libx11.inc
inherit gettext
+PR = "r1"
+
BBCLASSEXTEND = "native nativesdk"
EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11"
@@ -12,6 +14,7 @@ DEPENDS += "util-macros xtrans libxdmcp libxau \
SRC_URI += " file://keysymdef_include.patch \
file://x11_disable_makekeys.patch \
+ file://0001-Add-_XGetRequest-as-substitute-for-GetReq-GetReqExtr.patch \
"
SRC_URI[md5sum] = "ed7c382cbf8c13425b6a66bcac0ca5d9"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 29/35] mtools-3.9.9: Use correct URI for the mirror
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (27 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 28/35] libx11: Backport _XGetRequest API Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 30/35] pseudo: Wrap renameat and opendir Saul Wold
` (6 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-devtools/mtools/mtools_3.9.9.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/mtools/mtools_3.9.9.bb b/meta/recipes-devtools/mtools/mtools_3.9.9.bb
index 02921f7..cced7da 100644
--- a/meta/recipes-devtools/mtools/mtools_3.9.9.bb
+++ b/meta/recipes-devtools/mtools/mtools_3.9.9.bb
@@ -6,10 +6,10 @@ DESCRIPTION = "Mtools is a collection of utilities for accessing MS-DOS disks fr
HOMEPAGE = "http://www.gnu.org/software/mtools/"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=92b58ec77696788ce278b044d2a8e9d3"
-PR = "r4"
+PR = "r5"
#http://mtools.linux.lu/mtools-${PV}.tar.gz
-SRC_URI = "http://autobuilder.yoctoproject.org/sources/mtools-${PV}.tar.gz \
+SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/mtools-${PV}.tar.gz \
file://mtools-makeinfo.patch \
file://mtools.patch \
file://no-x11.patch"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 30/35] pseudo: Wrap renameat and opendir
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (28 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 29/35] mtools-3.9.9: Use correct URI for the mirror Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 31/35] uclibc: Upgrade recipes from 0.9.32 -> 0.9.33 Saul Wold
` (5 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-devtools/pseudo/pseudo/opendir.patch | 94 ++++++++
meta/recipes-devtools/pseudo/pseudo/renameat.patch | 229 ++++++++++++++++++++
meta/recipes-devtools/pseudo/pseudo_1.2.bb | 6 +-
3 files changed, 327 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-devtools/pseudo/pseudo/opendir.patch
create mode 100644 meta/recipes-devtools/pseudo/pseudo/renameat.patch
diff --git a/meta/recipes-devtools/pseudo/pseudo/opendir.patch b/meta/recipes-devtools/pseudo/pseudo/opendir.patch
new file mode 100644
index 0000000..bc6cec8
--- /dev/null
+++ b/meta/recipes-devtools/pseudo/pseudo/opendir.patch
@@ -0,0 +1,94 @@
+commit 162f2692c399b93311652201a940fdaf9c9e6924
+Author: Peter Seebach <peter.seebach@windriver.com>
+Date: Thu Feb 2 11:45:42 2012 -0600
+
+ Make opendir/closedir stash and forget directory names.
+
+ The dirfd(DIR *) interface allows you to get the fd for a DIR *,
+ meaning you can use it with openat(), meaning you can need its
+ path. This causes a segfault. Also gonna fix the base_path
+ code not to segfault in that case, but first fix the underlying
+ problem.
+
+Upstream-Status: Backport
+
+diff --git a/ChangeLog.txt b/ChangeLog.txt
+index 4de488c..9625b38 100644
+--- a/ChangeLog.txt
++++ b/ChangeLog.txt
+@@ -1,3 +1,7 @@
++2012-02-02:
++ * (seebs) stash dir name for DIR * from opendir using dirfd.
++ * (seebs) add closedir.
++
+ 2011-11-02:
+ * (seebs) Call this 1.2 because the UNLOAD change is moderately
+ significant, and so's the clone change.
+diff --git a/ports/unix/guts/closedir.c b/ports/unix/guts/closedir.c
+new file mode 100644
+index 0000000..1085361
+--- /dev/null
++++ b/ports/unix/guts/closedir.c
+@@ -0,0 +1,20 @@
++/*
++ * Copyright (c) 2012 Wind River Systems; see
++ * guts/COPYRIGHT for information.
++ *
++ * static int
++ * wrap_closedir(DIR *dirp) {
++ * int rc = -1;
++ */
++ if (!dirp) {
++ errno = EFAULT;
++ return -1;
++ }
++
++ int fd = dirfd(dirp);
++ pseudo_client_op(OP_CLOSE, 0, fd, -1, 0, 0);
++ rc = real_closedir(dirp);
++
++/* return rc;
++ * }
++ */
+diff --git a/ports/unix/guts/opendir.c b/ports/unix/guts/opendir.c
+index 8eaa71f..e69717e 100644
+--- a/ports/unix/guts/opendir.c
++++ b/ports/unix/guts/opendir.c
+@@ -6,8 +6,25 @@
+ * wrap_opendir(const char *path) {
+ * DIR * rc = NULL;
+ */
++ struct stat buf;
++ int save_errno;
+
+ rc = real_opendir(path);
++ if (rc) {
++ int fd;
++ save_errno = errno;
++ fd = dirfd(rc);
++ if (real_fstat(fd, &buf) == -1) {
++ pseudo_debug(1, "diropen (fd %d) succeeded, but fstat failed (%s).\n",
++ fd, strerror(errno));
++ pseudo_client_op_plain(OP_OPEN, PSA_READ, fd, -1, path, 0);
++ } else {
++ pseudo_client_op_plain(OP_OPEN, PSA_READ, fd, -1, path, &buf);
++ }
++
++
++ errno = save_errno;
++ }
+
+ /* return rc;
+ * }
+diff --git a/ports/unix/wrapfuncs.in b/ports/unix/wrapfuncs.in
+index e06e404..32250c4 100644
+--- a/ports/unix/wrapfuncs.in
++++ b/ports/unix/wrapfuncs.in
+@@ -21,6 +21,7 @@ long pathconf(const char *path, int name);
+ char *realpath(const char *name, char *resolved_name); /* version="GLIBC_2.3" */
+ int remove(const char *path); /* flags=AT_SYMLINK_NOFOLLOW */
+ DIR *opendir(const char *path);
++int closedir(DIR *dirp);
+ char *tempnam(const char *template, const char *pfx);
+ char *tmpnam(char *s);
+ int truncate(const char *path, off_t length);
diff --git a/meta/recipes-devtools/pseudo/pseudo/renameat.patch b/meta/recipes-devtools/pseudo/pseudo/renameat.patch
new file mode 100644
index 0000000..a2b2cbc
--- /dev/null
+++ b/meta/recipes-devtools/pseudo/pseudo/renameat.patch
@@ -0,0 +1,229 @@
+commit 795f2b44b7f692151556782f142a4a6e7d45d892
+Author: Peter Seebach <peter.seebach@windriver.com>
+Date: Thu Feb 2 15:49:21 2012 -0600
+
+ Implement renameat()
+
+ After three long years, someone tried to use this. This was impossibly
+ hard back when pseudo was written, because there was only one dirfd
+ provided for. Thing is, now, the canonicalization happens in wrapfuncs,
+ so a small tweak to makewrappers to recognize that oldpath should use
+ olddirfd if it exists is enough to get us fully canonicalized paths
+ when needed.
+
+ Also fix the crash if base_path gets called with an fd for which we have
+ no path.
+
+Upstream-Status: Backport
+
+diff --git a/ChangeLog.txt b/ChangeLog.txt
+index 9625b38..25bd463 100644
+--- a/ChangeLog.txt
++++ b/ChangeLog.txt
+@@ -1,6 +1,9 @@
+ 2012-02-02:
+ * (seebs) stash dir name for DIR * from opendir using dirfd.
+ * (seebs) add closedir.
++ * (seebs) add initial pass at renameat()
++ * (seebs) in base_path, don't try to strlen the result if
++ fd_path() returns NULL.
+
+ 2011-11-02:
+ * (seebs) Call this 1.2 because the UNLOAD change is moderately
+diff --git a/makewrappers b/makewrappers
+index 20bbf2b..bf344d6 100755
+--- a/makewrappers
++++ b/makewrappers
+@@ -211,12 +211,13 @@ class Function:
+ self.flags = '0'
+ self.port = port
+ self.directory = ''
+- self.version = 'NULL'
++ self.version = 'NULL'
+ # On Darwin, some functions are SECRETLY converted to foo$INODE64
+ # when called. So we have to look those up for real_*
+ self.inode64 = None
+ self.real_func = None
+ self.paths_to_munge = []
++ self.dirfds = {}
+ self.hand_wrapped = None
+ # used for the copyright date when creating stub functions
+ self.date = datetime.date.today().year
+@@ -239,6 +240,7 @@ class Function:
+ # * If the arg has a name ending in 'path', we will canonicalize it.
+ # * If the arg is named 'dirfd' or 'flags', it becomes the default
+ # values for the dirfd and flags arguments when canonicalizing.
++ # * If the name ends in dirfd, we do the same fancy stuff.
+ # * Note that the "comments" field (/* ... */ after the decl) can
+ # override the dirfd/flags values.
+ self.args = ArgumentList(bits.group(2))
+@@ -246,7 +248,9 @@ class Function:
+ # ignore varargs, they never get these special treatments
+ if arg.vararg:
+ pass
+- elif arg.name == 'dirfd':
++ elif arg.name[-5:] == 'dirfd':
++ if len(arg.name) > 5:
++ self.dirfds[arg.name[:-5]] = True
+ self.dirfd = 'dirfd'
+ elif arg.name == 'flags':
+ self.flags = 'flags'
+@@ -325,9 +329,13 @@ class Function:
+ """create/allocate canonical paths"""
+ alloc_paths = []
+ for path in self.paths_to_munge:
++ prefix = path[:-4]
++ if not prefix in self.dirfds:
++ prefix = ''
++ print "for path %s: prefix <%s>" % ( path, prefix )
+ alloc_paths.append(
+- "%s = pseudo_root_path(__func__, __LINE__, %s, %s, %s);" %
+- (path, self.dirfd, path, self.flags))
++ "%s = pseudo_root_path(__func__, __LINE__, %s%s, %s, %s);" %
++ (path, prefix, self.dirfd, path, self.flags))
+ return "\n\t\t\t".join(alloc_paths)
+
+ def free_paths(self):
+diff --git a/ports/unix/guts/renameat.c b/ports/unix/guts/renameat.c
+index c8203b7..f13cd1e 100644
+--- a/ports/unix/guts/renameat.c
++++ b/ports/unix/guts/renameat.c
+@@ -1,15 +1,111 @@
+ /*
+- * Copyright (c) 2008-2010 Wind River Systems; see
++ * Copyright (c) 2008-2012 Wind River Systems; see
+ * guts/COPYRIGHT for information.
+ *
+ * static int
+ * wrap_renameat(int olddirfd, const char *oldpath, int newdirfd, const char *newpath) {
+ * int rc = -1;
+ */
++ pseudo_msg_t *msg;
++ struct stat oldbuf, newbuf;
++ int oldrc, newrc;
++ int save_errno;
++ int old_db_entry = 0;
+
+- pseudo_diag("help! unimplemented renameat [%s -> %s].\n", oldpath, newpath);
++ pseudo_debug(2, "renameat: %d,%s->%d,%s\n",
++ olddirfd, oldpath ? oldpath : "<nil>",
++ newdirfd, newpath ? newpath : "<nil>");
++
++#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS
++ if (olddirfd != AT_FDCWD || newdirfd != AT_FDCWD) {
++ errno = ENOSYS;
++ return -1;
++ }
++#endif
++
++ if (!oldpath || !newpath) {
++ errno = EFAULT;
++ return -1;
++ }
++
++ save_errno = errno;
++
++#ifdef PSEUDO_NO_REAL_AT_FUNCTIONS
++ newrc = real_lstat(newpath, &newbuf);
++ oldrc = real_lstat(oldpath, &oldbuf);
++#else
++ oldrc = real___fxstatat(_STAT_VER, olddirfd, oldpath, &oldbuf, AT_SYMLINK_NOFOLLOW);
++ newrc = real___fxstatat(_STAT_VER, newdirfd, newpath, &newbuf, AT_SYMLINK_NOFOLLOW);
++#endif
++
++ errno = save_errno;
++
++ /* newpath must be removed. */
++ /* as with unlink, we have to mark that the file may get deleted */
++ msg = pseudo_client_op_plain(OP_MAY_UNLINK, 0, -1, newdirfd, newpath, newrc ? NULL : &newbuf);
++ if (msg && msg->result == RESULT_SUCCEED)
++ old_db_entry = 1;
+ rc = real_renameat(olddirfd, oldpath, newdirfd, newpath);
++ save_errno = errno;
++ if (old_db_entry) {
++ if (rc == -1) {
++ /* since we failed, that wasn't really unlinked -- put
++ * it back.
++ */
++ pseudo_client_op_plain(OP_CANCEL_UNLINK, 0, -1, newdirfd, newpath, &newbuf);
++ } else {
++ /* confirm that the file was removed */
++ pseudo_client_op_plain(OP_DID_UNLINK, 0, -1, newdirfd, newpath, &newbuf);
++ }
++ }
++ if (rc == -1) {
++ /* and we're done. */
++ errno = save_errno;
++ return rc;
++ }
++ save_errno = errno;
++ /* nothing to do for a "rename" of a link to itself */
++ if (newrc != -1 && oldrc != -1 &&
++ newbuf.st_dev == oldbuf.st_dev &&
++ newbuf.st_ino == oldbuf.st_ino) {
++ return rc;
++ }
++
++ /* rename(3) is not mv(1). rename(file, dir) fails; you must provide
++ * the corrected path yourself. You can rename over a directory only
++ * if the source is a directory. Symlinks are simply removed.
++ *
++ * If we got here, the real rename call succeeded. That means newpath
++ * has been unlinked and oldpath has been linked to it.
++ *
++ * There are a ton of special cases to error check. I don't check
++ * for any of them, because in every such case, the underlying rename
++ * failed, and there is nothing to do.
++ * The only tricky part is that, because we used to ignore symlinks,
++ * we may have to rename or remove directory trees even though in
++ * theory rename can never destroy a directory tree.
++ */
++ if (!old_db_entry) {
++ /* create an entry under the old name, which will then be
++ * renamed; this way, children would get renamed too, if there
++ * were any.
++ */
++ if (newrc == 0) {
++ if (newbuf.st_dev != oldbuf.st_dev) {
++ oldbuf.st_dev = newbuf.st_dev;
++ oldbuf.st_ino = newbuf.st_ino;
++ }
++ }
++ pseudo_debug(1, "creating new '%s' [%llu] to rename\n",
++ oldpath, (unsigned long long) oldbuf.st_ino);
++ pseudo_client_op_plain(OP_LINK, 0, -1, olddirfd, oldpath, &oldbuf);
++ }
++ /* special case: use 'fd' for olddirfd, because
++ * we know it has no other meaning for RENAME
++ */
++ pseudo_client_op_plain(OP_RENAME, 0, olddirfd, newdirfd, newpath, &oldbuf, oldpath);
+
++ errno = save_errno;
+ /* return rc;
+ * }
+ */
+diff --git a/pseudo_client.c b/pseudo_client.c
+index 48607c2..4a30420 100644
+--- a/pseudo_client.c
++++ b/pseudo_client.c
+@@ -988,6 +988,8 @@ base_path(int dirfd, const char *path, int leave_last) {
+ if (dirfd != -1 && dirfd != AT_FDCWD) {
+ if (dirfd >= 0) {
+ basepath = fd_path(dirfd);
++ }
++ if (basepath) {
+ baselen = strlen(basepath);
+ } else {
+ pseudo_diag("got *at() syscall for unknown directory, fd %d\n", dirfd);
+@@ -1128,7 +1130,10 @@ pseudo_client_op(pseudo_op_t op, int access, int fd, int dirfd, const char *path
+ if (path) {
+ pseudo_debug(2, " %s", path);
+ }
+- if (fd != -1) {
++ /* for OP_RENAME in renameat, "fd" is also used for the
++ * second dirfd.
++ */
++ if (fd != -1 && op != OP_RENAME) {
+ pseudo_debug(2, " [fd %d]", fd);
+ }
+ if (buf) {
diff --git a/meta/recipes-devtools/pseudo/pseudo_1.2.bb b/meta/recipes-devtools/pseudo/pseudo_1.2.bb
index f2ebc22..04bcbce 100644
--- a/meta/recipes-devtools/pseudo/pseudo_1.2.bb
+++ b/meta/recipes-devtools/pseudo/pseudo_1.2.bb
@@ -1,10 +1,12 @@
require pseudo.inc
-PR = "r4"
+PR = "r5"
SRC_URI = "http://www.yoctoproject.org/downloads/${BPN}/${BPN}-${PV}.tar.bz2 \
file://oe-config.patch \
- file://static_sqlite.patch"
+ file://static_sqlite.patch \
+ file://opendir.patch \
+ file://renameat.patch"
SRC_URI[md5sum] = "a2819084bab7e991f06626d02cf55048"
SRC_URI[sha256sum] = "4749a22df687f44d24c26e97170d4781a1bd52d5ee092364a40877e4d96ff058"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 31/35] uclibc: Upgrade recipes from 0.9.32 -> 0.9.33
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (29 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 30/35] pseudo: Wrap renameat and opendir Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 32/35] classes, recipes: Replace POKY_* with CORE_IMAGE_* Saul Wold
` (4 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
Prefer 0.9.33 by default
Delete recipes for 0.9.32
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/conf/distro/include/tcmode-default.inc | 2 +-
...rch-Free-UCLIBC_HAS_FPU-setting-from-depe.patch | 29 --
...fd.h-SFD_NONBLOCK-for-mips-is-0200-unlike.patch | 33 --
.../uclibc-0.9.32/detect-bx-availibility.patch | 75 ----
.../uclibc/uclibc-0.9.32/epoll-asm-fix.patch | 25 --
.../uclibc/uclibc-0.9.32/include-arm-asm.h.patch | 65 ---
.../uclibc/uclibc-0.9.32/mount.h-update.patch | 85 ----
.../uclibc-0.9.32/remove-eabi-oabi-selection.patch | 91 ----
.../uclibc-0.9.32/remove-sub-arch-variants.patch | 215 ---------
.../uclibc/uclibc-0.9.32/rtld_no.patch | 215 ---------
.../uclibc/uclibc-0.9.32/select-force-thumb.patch | 172 --------
.../uclibc/uclibc-0.9.32/sync_file_range2.patch | 47 --
.../uclibc-0.9.32/transform-eabi-oabi-choice.patch | 71 ---
.../uclibc-0.9.32/uclibc-arm-ftruncate64.patch | 13 -
.../uclibc-0.9.32/uclibc_scheduler_update.patch | 455 --------------------
...rr-and-pass-it-to-INTERNAL_SYSCALL_NCS-so.patch | 32 ++
...fstat-Use-64bit-version-of-syscall-if-ava.patch | 177 ++++++++
| 2 +
.../argp-support.patch | 3 +
.../compile-arm-fork-with-O2.patch | 2 +-
.../uclibc-0.9.33/define-MSG_CMSG_CLOEXEC.patch | 25 ++
meta/recipes-core/uclibc/uclibc-0.9.33/dup3.patch | 37 ++
...so_use_arm_dl_linux_resolve_in_thumb_mode.patch | 6 +
.../libc_symbols_include_bits_uclibc_config.patch | 19 +
.../mips/uClibc.machine | 0
.../orign_path.patch | 94 ++--
.../powerpc_copysignl.patch | 6 +
.../remove_attribute_optimize_Os.patch | 17 +-
.../{uclibc-0.9.32 => uclibc-0.9.33}/uClibc.distro | 8 +-
.../uClibc.machine | 0
.../uclibc-execvpe.patch | 3 +
.../uclibc_enable_log2_test.patch | 5 +
...-initial_0.9.32.bb => uclibc-initial_0.9.33.bb} | 0
.../uclibc/{uclibc_0.9.32.bb => uclibc_0.9.33.bb} | 26 +-
34 files changed, 386 insertions(+), 1669 deletions(-)
delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.32/0001-Config.in.arch-Free-UCLIBC_HAS_FPU-setting-from-depe.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.32/0001-mips-signalfd.h-SFD_NONBLOCK-for-mips-is-0200-unlike.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.32/detect-bx-availibility.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.32/epoll-asm-fix.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.32/include-arm-asm.h.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.32/mount.h-update.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.32/remove-eabi-oabi-selection.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.32/remove-sub-arch-variants.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.32/rtld_no.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.32/select-force-thumb.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.32/sync_file_range2.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.32/transform-eabi-oabi-choice.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.32/uclibc-arm-ftruncate64.patch
delete mode 100644 meta/recipes-core/uclibc/uclibc-0.9.32/uclibc_scheduler_update.patch
create mode 100644 meta/recipes-core/uclibc/uclibc-0.9.33/0001-Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS-so.patch
create mode 100644 meta/recipes-core/uclibc/uclibc-0.9.33/0001-lstat-stat-fstat-Use-64bit-version-of-syscall-if-ava.patch
rename meta/recipes-core/uclibc/{uclibc-0.9.32 => uclibc-0.9.33}/argp-headers.patch (99%)
rename meta/recipes-core/uclibc/{uclibc-0.9.32 => uclibc-0.9.33}/argp-support.patch (99%)
rename meta/recipes-core/uclibc/{uclibc-0.9.32 => uclibc-0.9.33}/compile-arm-fork-with-O2.patch (97%)
create mode 100644 meta/recipes-core/uclibc/uclibc-0.9.33/define-MSG_CMSG_CLOEXEC.patch
create mode 100644 meta/recipes-core/uclibc/uclibc-0.9.33/dup3.patch
rename meta/recipes-core/uclibc/{uclibc-0.9.32 => uclibc-0.9.33}/ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch (86%)
create mode 100644 meta/recipes-core/uclibc/uclibc-0.9.33/libc_symbols_include_bits_uclibc_config.patch
rename meta/recipes-core/uclibc/{uclibc-0.9.32 => uclibc-0.9.33}/mips/uClibc.machine (100%)
rename meta/recipes-core/uclibc/{uclibc-0.9.32 => uclibc-0.9.33}/orign_path.patch (64%)
rename meta/recipes-core/uclibc/{uclibc-0.9.32 => uclibc-0.9.33}/powerpc_copysignl.patch (96%)
rename meta/recipes-core/uclibc/{uclibc-0.9.32 => uclibc-0.9.33}/remove_attribute_optimize_Os.patch (93%)
rename meta/recipes-core/uclibc/{uclibc-0.9.32 => uclibc-0.9.33}/uClibc.distro (96%)
rename meta/recipes-core/uclibc/{uclibc-0.9.32 => uclibc-0.9.33}/uClibc.machine (100%)
rename meta/recipes-core/uclibc/{uclibc-0.9.32 => uclibc-0.9.33}/uclibc-execvpe.patch (99%)
rename meta/recipes-core/uclibc/{uclibc-0.9.32 => uclibc-0.9.33}/uclibc_enable_log2_test.patch (81%)
rename meta/recipes-core/uclibc/{uclibc-initial_0.9.32.bb => uclibc-initial_0.9.33.bb} (100%)
rename meta/recipes-core/uclibc/{uclibc_0.9.32.bb => uclibc_0.9.33.bb} (45%)
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 5bb253e..b7c2160 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -20,7 +20,7 @@ GCCVERSION ?= "4.6%"
SDKGCCVERSION ?= "4.6%"
BINUVERSION ?= "2.22"
EGLIBCVERSION ?= "2.13"
-UCLIBCVERSION ?= "0.9.32"
+UCLIBCVERSION ?= "0.9.33"
LINUXLIBCVERSION ?= "3.1"
PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/0001-Config.in.arch-Free-UCLIBC_HAS_FPU-setting-from-depe.patch b/meta/recipes-core/uclibc/uclibc-0.9.32/0001-Config.in.arch-Free-UCLIBC_HAS_FPU-setting-from-depe.patch
deleted file mode 100644
index da97d38..0000000
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/0001-Config.in.arch-Free-UCLIBC_HAS_FPU-setting-from-depe.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 06cdcd2a9dd6b46b7fbb5b3ae0a62bdb7ee6c402 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 27 Jun 2011 17:48:18 -0700
-Subject: [PATCH] Config.in.arch: Free UCLIBC_HAS_FPU setting from depending on UCLIBC_HAS_FLOATS
-
-UCLIBC_HAS_FLOATS and UCLIBC_HAS_FPU are denoting two different aspects.
-UCLIBC_HAS_FLOATS covers the floating point operations which has nothing
-to do if you have FPU or not.
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- extra/Configs/Config.in.arch | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/extra/Configs/Config.in.arch b/extra/Configs/Config.in.arch
-index 5f7a2b0..c1ca390 100644
---- a/extra/Configs/Config.in.arch
-+++ b/extra/Configs/Config.in.arch
-@@ -133,7 +133,6 @@ config UCLIBC_HAS_FLOATS
-
- config UCLIBC_HAS_FPU
- bool "Target CPU has a floating point unit (FPU)"
-- depends on UCLIBC_HAS_FLOATS
- default y
- help
- If your target CPU does not have a Floating Point Unit (FPU) or a
---
-1.7.0.4
-
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/0001-mips-signalfd.h-SFD_NONBLOCK-for-mips-is-0200-unlike.patch b/meta/recipes-core/uclibc/uclibc-0.9.32/0001-mips-signalfd.h-SFD_NONBLOCK-for-mips-is-0200-unlike.patch
deleted file mode 100644
index 6892ceb..0000000
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/0001-mips-signalfd.h-SFD_NONBLOCK-for-mips-is-0200-unlike.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From ecc7d34cbbaf83aae87b091555650ed33e27ed2e Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 30 Jun 2011 00:32:11 -0700
-Subject: [PATCH] mips/signalfd.h: SFD_NONBLOCK for mips is 0200 unlike 04000 commonly
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- include/sys/signalfd.h | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
-
-diff --git a/include/sys/signalfd.h b/include/sys/signalfd.h
-index 8cee17c..f1cb63a 100644
---- a/include/sys/signalfd.h
-+++ b/include/sys/signalfd.h
-@@ -64,6 +64,15 @@ enum
- # define SFD_NONBLOCK SFD_NONBLOCK
- };
-
-+#elif defined __mips__
-+enum
-+ {
-+ SFD_CLOEXEC = 02000000,
-+# define SFD_CLOEXEC SFD_CLOEXEC
-+ SFD_NONBLOCK = 0200
-+# define SFD_NONBLOCK SFD_NONBLOCK
-+ };
-+
- #else
- enum
- {
---
-1.7.0.4
-
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/detect-bx-availibility.patch b/meta/recipes-core/uclibc/uclibc-0.9.32/detect-bx-availibility.patch
deleted file mode 100644
index 43d19fc..0000000
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/detect-bx-availibility.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Delivered-To: raj.khem@gmail.com
-Received: by 10.90.86.4 with SMTP id j4cs313307agb;
- Sat, 8 Jan 2011 16:45:20 -0800 (PST)
-Received: by 10.227.141.78 with SMTP id l14mr16920947wbu.128.1294533919168;
- Sat, 08 Jan 2011 16:45:19 -0800 (PST)
-Return-Path: <yann.morin.1998@anciens.enib.fr>
-Received: from smtp.smtpout.orange.fr (smtp01.smtpout.orange.fr [80.12.242.123])
- by mx.google.com with ESMTP id w30si33755908wbd.17.2011.01.08.16.45.18;
- Sat, 08 Jan 2011 16:45:19 -0800 (PST)
-Received-SPF: neutral (google.com: 80.12.242.123 is neither permitted nor denied by best guess record for domain of yann.morin.1998@anciens.enib.fr) client-ip=80.12.242.123;
-Authentication-Results: mx.google.com; spf=neutral (google.com: 80.12.242.123 is neither permitted nor denied by best guess record for domain of yann.morin.1998@anciens.enib.fr) smtp.mail=yann.morin.1998@anciens.enib.fr
-Received: from roazhon.bzh.lan ([90.32.245.227])
- by mwinf5d24 with ME
- id tClC1f0024v5z3u03ClHDo; Sun, 09 Jan 2011 01:45:18 +0100
-From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
-To: uclibc@uclibc.org
-Cc: Khem Raj <raj.khem@gmail.com>,
- Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>,
- Carmelo AMOROSO <carmelo.amoroso@st.com>
-Subject: [PATCH 6/7] ARM: detect BX availibility at build time
-Date: Sun, 9 Jan 2011 01:45:09 +0100
-Message-Id: <1294533910-19305-7-git-send-email-yann.morin.1998@anciens.enib.fr>
-X-Mailer: git-send-email 1.7.1
-In-Reply-To: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>
-References: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>
-
-The "use BX" option is now a suggestion that BX be used if available.
-Use a macro to detect if BX is available at build time. If so, and
-the user requested it be used, then use it. Otherwise, error out.
-
-Macro courtesy Khem RAJ:
- http://lists.uclibc.org/pipermail/uclibc/2009-April/042301.html
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
-Cc: Khem Raj <raj.khem@gmail.com>
-Cc: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
-Cc: Carmelo AMOROSO <carmelo.amoroso@st.com>
----
- extra/Configs/Config.arm | 4 +++-
- libc/sysdeps/linux/arm/bits/arm_asm.h | 9 ++++++++-
- 2 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm
-index 227b90c..9aa9e56 100644
---- a/extra/Configs/Config.arm
-+++ b/extra/Configs/Config.arm
-@@ -33,4 +33,6 @@ config COMPILE_IN_THUMB_MODE
- config USE_BX
- bool "Use BX in function return"
- help
-- Use BX instruction for THUMB aware architectures.
-+ Say 'y' to use BX to return from functions on your thumb-aware
-+ processor. Say 'y' if you need to use interworking. Say 'n' if not.
-+ It is safe to say 'y' even if you're not doing interworking.
-diff --git a/libc/sysdeps/linux/arm/bits/arm_asm.h b/libc/sysdeps/linux/arm/bits/arm_asm.h
-index 1d87df6..921c9a3 100644
---- a/libc/sysdeps/linux/arm/bits/arm_asm.h
-+++ b/libc/sysdeps/linux/arm/bits/arm_asm.h
-@@ -24,5 +24,12 @@
- #define THUMB1_ONLY 1
- #endif
-
--#endif /* _ARM_ASM_H */
-+#if defined(__USE_BX__)
-+# if ( defined (__ARM_ARCH_2__) || defined (__ARM_ARCH_3__) \
-+ || defined (__ARM_ARCH_3M__) || defined (__ARM_ARCH_4__) \
-+ )
-+# error Use of BX was requested, but is not available on the target processor.
-+# endif /* ARCH level */
-+#endif /* __USE_BX__ */
-
-+#endif /* _ARM_ASM_H */
---
-1.7.1
-
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/epoll-asm-fix.patch b/meta/recipes-core/uclibc/uclibc-0.9.32/epoll-asm-fix.patch
deleted file mode 100644
index bcd834d..0000000
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/epoll-asm-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Fix a compile error due to last argument to syscall() not being memory addressable.
-
-Upstream-Status: Pending
-Signed-off-by: Phil Blundell <philb@gnu.org>
-
-diff --git a/libc/sysdeps/linux/common/epoll.c b/libc/sysdeps/linux/common/epoll.c
-index 85b0cfd..c034b2c 100644
---- a/libc/sysdeps/linux/common/epoll.c
-+++ b/libc/sysdeps/linux/common/epoll.c
-@@ -67,12 +67,13 @@ extern __typeof(epoll_pwait) __libc_epoll_pwait;
- int __libc_epoll_pwait(int epfd, struct epoll_event *events, int maxevents,
- int timeout, const sigset_t *set)
- {
-+ int nsig = _NSIG / 8;
- if (SINGLE_THREAD_P)
-- return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8);
-+ return INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, nsig);
- # ifdef __UCLIBC_HAS_THREADS_NATIVE__
- else {
- int oldtype = LIBC_CANCEL_ASYNC ();
-- int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, _NSIG / 8);
-+ int result = INLINE_SYSCALL(epoll_pwait, 6, epfd, events, maxevents, timeout, set, nsig);
- LIBC_CANCEL_RESET (oldtype);
- return result;
- }
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/include-arm-asm.h.patch b/meta/recipes-core/uclibc/uclibc-0.9.32/include-arm-asm.h.patch
deleted file mode 100644
index 55c312e..0000000
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/include-arm-asm.h.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Delivered-To: raj.khem@gmail.com
-Received: by 10.90.86.4 with SMTP id j4cs313304agb;
- Sat, 8 Jan 2011 16:45:19 -0800 (PST)
-Received: by 10.227.155.75 with SMTP id r11mr17188266wbw.3.1294533918432;
- Sat, 08 Jan 2011 16:45:18 -0800 (PST)
-Return-Path: <yann.morin.1998@anciens.enib.fr>
-Received: from smtp.smtpout.orange.fr (smtp01.smtpout.orange.fr [80.12.242.123])
- by mx.google.com with ESMTP id k3si33753340wbx.29.2011.01.08.16.45.17;
- Sat, 08 Jan 2011 16:45:18 -0800 (PST)
-Received-SPF: neutral (google.com: 80.12.242.123 is neither permitted nor denied by best guess record for domain of yann.morin.1998@anciens.enib.fr) client-ip=80.12.242.123;
-Authentication-Results: mx.google.com; spf=neutral (google.com: 80.12.242.123 is neither permitted nor denied by best guess record for domain of yann.morin.1998@anciens.enib.fr) smtp.mail=yann.morin.1998@anciens.enib.fr
-Received: from roazhon.bzh.lan ([90.32.245.227])
- by mwinf5d24 with ME
- id tClC1f0024v5z3u03ClHDf; Sun, 09 Jan 2011 01:45:17 +0100
-From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
-To: uclibc@uclibc.org
-Cc: Khem Raj <raj.khem@gmail.com>,
- Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>,
- Carmelo AMOROSO <carmelo.amoroso@st.com>
-Subject: [PATCH 5/7] ARM: #include <bits/arm_asm.h> where __USE_BX__ is used
-Date: Sun, 9 Jan 2011 01:45:08 +0100
-Message-Id: <1294533910-19305-6-git-send-email-yann.morin.1998@anciens.enib.fr>
-X-Mailer: git-send-email 1.7.1
-In-Reply-To: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>
-References: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>
-
-The check for __USE_BX__ will be available in bits/arm_asm.h,
-so the latter must be included wherever the former is used.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
-Cc: Khem Raj <raj.khem@gmail.com>
-Cc: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
-Cc: Carmelo AMOROSO <carmelo.amoroso@st.com>
----
- ldso/ldso/arm/dl-startup.h | 1 +
- libc/sysdeps/linux/arm/sysdep.h | 1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/ldso/ldso/arm/dl-startup.h b/ldso/ldso/arm/dl-startup.h
-index a95389d..2dfdaff 100644
---- a/ldso/ldso/arm/dl-startup.h
-+++ b/ldso/ldso/arm/dl-startup.h
-@@ -7,6 +7,7 @@
- */
-
- #include <features.h>
-+#include <bits/arm_asm.h>
-
- #if !defined(__thumb__)
- __asm__(
-diff --git a/libc/sysdeps/linux/arm/sysdep.h b/libc/sysdeps/linux/arm/sysdep.h
-index 013f88c..e498695 100644
---- a/libc/sysdeps/linux/arm/sysdep.h
-+++ b/libc/sysdeps/linux/arm/sysdep.h
-@@ -21,6 +21,7 @@
- #define _LINUX_ARM_SYSDEP_H 1
-
- #include <common/sysdep.h>
-+#include <bits/arm_asm.h>
-
- #include <sys/syscall.h>
- /* For Linux we can use the system call table in the header file
---
-1.7.1
-
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/mount.h-update.patch b/meta/recipes-core/uclibc/uclibc-0.9.32/mount.h-update.patch
deleted file mode 100644
index 3508e0e..0000000
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/mount.h-update.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Sync mount.h from glibc this is needed to get missing defines
-that some apps e.g. systemd are depending on
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Pending
-
-Index: git/include/sys/mount.h
-===================================================================
---- git.orig/include/sys/mount.h 2011-07-21 14:37:27.134255747 -0700
-+++ git/include/sys/mount.h 2011-07-21 14:39:53.844470932 -0700
-@@ -1,5 +1,5 @@
- /* Header file for mounting/unmount Linux filesystems.
-- Copyright (C) 1996,1997,1998,1999,2000,2004 Free Software Foundation, Inc.
-+ Copyright (C) 1996-2000, 2004, 2010 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
-@@ -47,23 +47,46 @@
- #define MS_REMOUNT MS_REMOUNT
- MS_MANDLOCK = 64, /* Allow mandatory locks on an FS. */
- #define MS_MANDLOCK MS_MANDLOCK
-- S_WRITE = 128, /* Write on file/directory/symlink. */
--#define S_WRITE S_WRITE
-- S_APPEND = 256, /* Append-only file. */
--#define S_APPEND S_APPEND
-- S_IMMUTABLE = 512, /* Immutable file. */
--#define S_IMMUTABLE S_IMMUTABLE
-+ MS_DIRSYNC = 128, /* Directory modifications are synchronous. */
-+#define MS_DIRSYNC MS_DIRSYNC
- MS_NOATIME = 1024, /* Do not update access times. */
- #define MS_NOATIME MS_NOATIME
- MS_NODIRATIME = 2048, /* Do not update directory access times. */
- #define MS_NODIRATIME MS_NODIRATIME
- MS_BIND = 4096, /* Bind directory at different place. */
- #define MS_BIND MS_BIND
-+ MS_MOVE = 8192,
-+#define MS_MOVE MS_MOVE
-+ MS_REC = 16384,
-+#define MS_REC MS_REC
-+ MS_SILENT = 32768,
-+#define MS_SILENT MS_SILENT
-+ MS_POSIXACL = 1 << 16, /* VFS does not apply the umask. */
-+#define MS_POSIXACL MS_POSIXACL
-+ MS_UNBINDABLE = 1 << 17, /* Change to unbindable. */
-+#define MS_UNBINDABLE MS_UNBINDABLE
-+ MS_PRIVATE = 1 << 18, /* Change to private. */
-+#define MS_PRIVATE MS_PRIVATE
-+ MS_SLAVE = 1 << 19, /* Change to slave. */
-+#define MS_SLAVE MS_SLAVE
-+ MS_SHARED = 1 << 20, /* Change to shared. */
-+#define MS_SHARED MS_SHARED
-+ MS_RELATIME = 1 << 21, /* Update atime relative to mtime/ctime. */
-+#define MS_RELATIME MS_RELATIME
-+ MS_KERNMOUNT = 1 << 22, /* This is a kern_mount call. */
-+#define MS_KERNMOUNT MS_KERNMOUNT
-+ MS_I_VERSION = 1 << 23, /* Update inode I_version field. */
-+#define MS_I_VERSION MS_I_VERSION
-+ MS_STRICTATIME = 1 << 24, /* Always perform atime updates. */
-+#define MS_STRICTATIME MS_STRICTATIME
-+ MS_ACTIVE = 1 << 30,
-+#define MS_ACTIVE MS_ACTIVE
-+ MS_NOUSER = 1 << 31
-+#define MS_NOUSER MS_NOUSER
- };
-
- /* Flags that can be altered by MS_REMOUNT */
--#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_NOATIME \
-- |MS_NODIRATIME)
-+#define MS_RMT_MASK (MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK|MS_I_VERSION)
-
-
- /* Magic mount flag number. Has to be or-ed to the flag values. */
-@@ -100,8 +123,10 @@
- #define MNT_FORCE MNT_FORCE
- MNT_DETACH = 2, /* Just detach from the tree. */
- #define MNT_DETACH MNT_DETACH
-- MNT_EXPIRE = 4 /* Mark for expiry. */
-+ MNT_EXPIRE = 4, /* Mark for expiry. */
- #define MNT_EXPIRE MNT_EXPIRE
-+ UMOUNT_NOFOLLOW = 8 /* Don't follow symlink on umount. */
-+#define UMOUNT_NOFOLLOW UMOUNT_NOFOLLOW
- };
-
-
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/remove-eabi-oabi-selection.patch b/meta/recipes-core/uclibc/uclibc-0.9.32/remove-eabi-oabi-selection.patch
deleted file mode 100644
index 8f3464e..0000000
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/remove-eabi-oabi-selection.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-Delivered-To: raj.khem@gmail.com
-Received: by 10.90.86.4 with SMTP id j4cs313309agb;
- Sat, 8 Jan 2011 16:45:20 -0800 (PST)
-Received: by 10.216.173.7 with SMTP id u7mr612034wel.50.1294533919433;
- Sat, 08 Jan 2011 16:45:19 -0800 (PST)
-Return-Path: <yann.morin.1998@anciens.enib.fr>
-Received: from smtp.smtpout.orange.fr (smtp01.smtpout.orange.fr [80.12.242.123])
- by mx.google.com with ESMTP id e10si33752027wer.68.2011.01.08.16.45.19;
- Sat, 08 Jan 2011 16:45:19 -0800 (PST)
-Received-SPF: neutral (google.com: 80.12.242.123 is neither permitted nor denied by best guess record for domain of yann.morin.1998@anciens.enib.fr) client-ip=80.12.242.123;
-Authentication-Results: mx.google.com; spf=neutral (google.com: 80.12.242.123 is neither permitted nor denied by best guess record for domain of yann.morin.1998@anciens.enib.fr) smtp.mail=yann.morin.1998@anciens.enib.fr
-Received: from roazhon.bzh.lan ([90.32.245.227])
- by mwinf5d24 with ME
- id tClC1f0024v5z3u03ClJDu; Sun, 09 Jan 2011 01:45:18 +0100
-From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
-To: uclibc@uclibc.org
-Cc: Khem Raj <raj.khem@gmail.com>,
- Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>,
- Carmelo AMOROSO <carmelo.amoroso@st.com>
-Subject: [PATCH 7/7] ARM: remove EABI/OABI selection
-Date: Sun, 9 Jan 2011 01:45:10 +0100
-Message-Id: <1294533910-19305-8-git-send-email-yann.morin.1998@anciens.enib.fr>
-X-Mailer: git-send-email 1.7.1
-In-Reply-To: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>
-References: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>
-
-Rely on the compiler to be properly setup for the default ABI.
-
-When installing-headers, there are two cases:
-- NPTL: no issue, a cross-compiler is already expected
-- LinuxThreads: no issue, EABI/OABI has no impact on installed headers.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
-Cc: Khem Raj <raj.khem@gmail.com>
-Cc: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
-Cc: Carmelo AMOROSO <carmelo.amoroso@st.com>
----
- extra/Configs/Config.arm | 11 -----------
- libc/sysdeps/linux/arm/Makefile.arch | 9 +++++++--
- libc/sysdeps/linux/arm/bits/huge_val.h | 4 ++--
- 3 files changed, 9 insertions(+), 15 deletions(-)
-
-Index: git/libc/sysdeps/linux/arm/Makefile.arch
-===================================================================
---- git.orig/libc/sysdeps/linux/arm/Makefile.arch
-+++ git/libc/sysdeps/linux/arm/Makefile.arch
-@@ -24,7 +24,12 @@ ifeq ($(UCLIBC_HAS_ADVANCED_REALTIME),y)
- CSRC += posix_fadvise.c posix_fadvise64.c
- endif
-
--ifeq ($(CONFIG_ARM_EABI),y)
-+# Is our compiler set up for EABI ?
-+IS_EABI:=$(shell $(CC) $(CFLAGS) -x c - -E -dM </dev/null 2>/dev/null \
-+ |sed -r -e '/^\#[[:space:]]*define[[:space:]]+__ARM_EABI__([[:space:]]+1)?$$/!d; s/.+/y/;' \
-+ )
-+
-+ifeq ($(IS_EABI),y)
- CSRC += aeabi_assert.c aeabi_atexit.c aeabi_errno_addr.c \
- aeabi_localeconv.c aeabi_memclr.c aeabi_memcpy.c \
- aeabi_memmove.c aeabi_memset.c find_exidx.c
-@@ -37,7 +42,7 @@ else
- CSRC += syscall.c
- endif
-
--ifeq ($(CONFIG_ARM_EABI),y)
-+ifeq ($(IS_EABI),y)
- libc-static-y += $(ARCH_OUT)/aeabi_lcsts.o $(ARCH_OUT)/aeabi_math.o \
- $(ARCH_OUT)/aeabi_sighandlers.o
- libc-nonshared-y += $(ARCH_OUT)/aeabi_lcsts.os $(ARCH_OUT)/aeabi_math.os \
-Index: git/libc/sysdeps/linux/arm/bits/huge_val.h
-===================================================================
---- git.orig/libc/sysdeps/linux/arm/bits/huge_val.h
-+++ git/libc/sysdeps/linux/arm/bits/huge_val.h
-@@ -32,7 +32,7 @@
- # define HUGE_VAL (__extension__ 0x1.0p2047)
- #elif defined __GNUC__
-
--#ifndef __CONFIG_ARM_EABI__
-+#ifndef __ARM_EABI__
- # define HUGE_VAL \
- (__extension__ \
- ((union { unsigned __l __attribute__((__mode__(__DI__))); double __d; }) \
-@@ -50,7 +50,7 @@
-
- typedef union { unsigned char __c[8]; double __d; } __huge_val_t;
-
--#ifndef __CONFIG_ARM_EABI__
-+#ifndef __ARM_EABI__
- # if __BYTE_ORDER == __BIG_ENDIAN
- # define __HUGE_VAL_bytes { 0, 0, 0, 0, 0x7f, 0xf0, 0, 0 }
- # endif
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/remove-sub-arch-variants.patch b/meta/recipes-core/uclibc/uclibc-0.9.32/remove-sub-arch-variants.patch
deleted file mode 100644
index 920a669..0000000
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/remove-sub-arch-variants.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-Delivered-To: raj.khem@gmail.com
-Received: by 10.90.86.4 with SMTP id j4cs313303agb;
- Sat, 8 Jan 2011 16:45:18 -0800 (PST)
-Received: by 10.227.98.158 with SMTP id q30mr1255804wbn.151.1294533917314;
- Sat, 08 Jan 2011 16:45:17 -0800 (PST)
-Return-Path: <yann.morin.1998@anciens.enib.fr>
-Received: from smtp.smtpout.orange.fr (smtp01.smtpout.orange.fr [80.12.242.123])
- by mx.google.com with ESMTP id r3si33749838wbr.54.2011.01.08.16.45.16;
- Sat, 08 Jan 2011 16:45:17 -0800 (PST)
-Received-SPF: neutral (google.com: 80.12.242.123 is neither permitted nor denied by best guess record for domain of yann.morin.1998@anciens.enib.fr) client-ip=80.12.242.123;
-Authentication-Results: mx.google.com; spf=neutral (google.com: 80.12.242.123 is neither permitted nor denied by best guess record for domain of yann.morin.1998@anciens.enib.fr) smtp.mail=yann.morin.1998@anciens.enib.fr
-Received: from roazhon.bzh.lan ([90.32.245.227])
- by mwinf5d24 with ME
- id tClC1f0024v5z3u03ClGDS; Sun, 09 Jan 2011 01:45:16 +0100
-From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
-To: uclibc@uclibc.org
-Cc: Khem Raj <raj.khem@gmail.com>,
- Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>,
- Carmelo AMOROSO <carmelo.amoroso@st.com>
-Subject: [PATCH 3/7] ARM: remove sub-arch/variants selection from menuconfig
-Date: Sun, 9 Jan 2011 01:45:06 +0100
-Message-Id: <1294533910-19305-4-git-send-email-yann.morin.1998@anciens.enib.fr>
-X-Mailer: git-send-email 1.7.1
-In-Reply-To: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>
-References: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>
-
-Rely on the compiler to be correctly set up to generate
-appropriate code for the target variant.
-
-This exposes the Thumb option, as it is no longer auto-selected.
-The "Use BX" no longer depends on supported CPU to be selected,
-so it now defaults to 'n' as it shall work by default on CPUs
-that do not have BX.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
-Cc: Khem Raj <raj.khem@gmail.com>
-Cc: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
-Cc: Carmelo AMOROSO <carmelo.amoroso@st.com>
----
- Rules.mak | 19 -------
- extra/Configs/Config.arm | 125 ++--------------------------------------------
- 2 files changed, 5 insertions(+), 139 deletions(-)
-
-diff --git a/Rules.mak b/Rules.mak
-index 2a16908..09741a6 100644
---- a/Rules.mak
-+++ b/Rules.mak
-@@ -332,25 +332,6 @@ ifeq ($(TARGET_ARCH),arm)
- OPTIMIZATION+=-fstrict-aliasing
- CPU_CFLAGS-$(ARCH_LITTLE_ENDIAN)+=-mlittle-endian
- CPU_CFLAGS-$(ARCH_BIG_ENDIAN)+=-mbig-endian
-- CPU_CFLAGS-$(CONFIG_GENERIC_ARM)+=
-- CPU_CFLAGS-$(CONFIG_ARM610)+=-mtune=arm610 -march=armv3
-- CPU_CFLAGS-$(CONFIG_ARM710)+=-mtune=arm710 -march=armv3
-- CPU_CFLAGS-$(CONFIG_ARM7TDMI)+=-mtune=arm7tdmi -march=armv4t
-- CPU_CFLAGS-$(CONFIG_ARM720T)+=-mtune=arm7tdmi -march=armv4t
-- CPU_CFLAGS-$(CONFIG_ARM920T)+=-mtune=arm9tdmi -march=armv4t
-- CPU_CFLAGS-$(CONFIG_ARM922T)+=-mtune=arm9tdmi -march=armv4t
-- CPU_CFLAGS-$(CONFIG_ARM926T)+=-mtune=arm9e -march=armv5te
-- CPU_CFLAGS-$(CONFIG_ARM10T)+=-mtune=arm10tdmi -march=armv5t
-- CPU_CFLAGS-$(CONFIG_ARM1136JF_S)+=-mtune=arm1136jf-s -march=armv6
-- CPU_CFLAGS-$(CONFIG_ARM1176JZ_S)+=-mtune=arm1176jz-s -march=armv6
-- CPU_CFLAGS-$(CONFIG_ARM1176JZF_S)+=-mtune=arm1176jzf-s -march=armv6
-- CPU_CFLAGS-$(CONFIG_ARM_SA110)+=-mtune=strongarm110 -march=armv4
-- CPU_CFLAGS-$(CONFIG_ARM_SA1100)+=-mtune=strongarm1100 -march=armv4
-- CPU_CFLAGS-$(CONFIG_ARM_XSCALE)+=$(call check_gcc,-mtune=xscale,-mtune=strongarm110)
-- CPU_CFLAGS-$(CONFIG_ARM_XSCALE)+=-march=armv5te -Wa,-mcpu=xscale
-- CPU_CFLAGS-$(CONFIG_ARM_IWMMXT)+=-march=iwmmxt -Wa,-mcpu=iwmmxt -mabi=iwmmxt
-- CPU_CFLAGS-$(CONFIG_ARM_CORTEX_M3)+=-mcpu=cortex-m3
-- CPU_CFLAGS-$(CONFIG_ARM_CORTEX_M1)+=-mcpu=cortex-m1
- CPU_CFLAGS-$(COMPILE_IN_THUMB_MODE)+=-mthumb
- endif
-
-diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm
-index c9c40d4..6c75a00 100644
---- a/extra/Configs/Config.arm
-+++ b/extra/Configs/Config.arm
-@@ -30,129 +30,14 @@ config CONFIG_ARM_EABI
-
- endchoice
-
--choice
-- prompt "Target Processor Type"
-- default CONFIG_GENERIC_ARM
-- help
-- This is the processor type of your CPU. This information is used for
-- optimizing purposes. To build a library that will run on all ARMCPU
-- types (albeit not optimally fast), you can specify "Generic Arm" here.
-- If you pick anything other than "Generic Arm", there is no guarantee
-- that uClibc will even run on anything other than the selected
-- processor type.
--
-- Here are the settings recommended for greatest speed:
-- - "Generic Arm" select this if your compiler is already setup to
-- optimize things properly, or if you want to run on pretty much
-- everything, or you just don't much care.
-- - For anything else, pick the ARM core type that best matches the
-- cpu you will be using on your device.
--
-- If you don't know what to do, choose "Generic Arm".
--
--config CONFIG_GENERIC_ARM
-- bool "Generic Arm"
--
--config CONFIG_ARM610
-- bool "Arm 610"
-- select ARCH_HAS_MMU
--
--config CONFIG_ARM710
-- bool "Arm 710"
-- select ARCH_HAS_MMU
--
--config CONFIG_ARM7TDMI
-- bool "Arm 7TDMI"
-- select ARCH_HAS_NO_MMU
-- select HAS_THUMB
--
--config CONFIG_ARM720T
-- bool "Arm 720T"
-- select ARCH_HAS_MMU
-- select HAS_THUMB
--
--config CONFIG_ARM920T
-- bool "Arm 920T"
-- select ARCH_HAS_MMU
-- select HAS_THUMB
--
--config CONFIG_ARM922T
-- bool "Arm 922T"
-- select ARCH_HAS_MMU
-- select HAS_THUMB
--
--config CONFIG_ARM926T
-- bool "Arm 926T"
-- select ARCH_HAS_MMU
-- select HAS_THUMB
--
--config CONFIG_ARM10T
-- bool "Arm 10T"
-- select ARCH_HAS_MMU
-- select HAS_THUMB
--
--config CONFIG_ARM1136JF_S
-- bool "Arm 1136JF-S"
-- select ARCH_HAS_MMU
-- select HAS_THUMB
--
--config CONFIG_ARM1176JZ_S
-- bool "Arm 1176JZ-S"
-- select ARCH_HAS_MMU
-- select HAS_THUMB
--
--config CONFIG_ARM1176JZF_S
-- bool "Arm 1176JZF-S"
-- select ARCH_HAS_MMU
-- select HAS_THUMB
--
--config CONFIG_ARM_CORTEX_M3
-- bool "Arm Cortex-M3"
-- select ARCH_HAS_NO_MMU
-- select FORCE_THUMB
--
--config CONFIG_ARM_CORTEX_M1
-- bool "Arm Cortex-M1"
-- select ARCH_HAS_NO_MMU
-- select FORCE_THUMB
--
--config CONFIG_ARM_SA110
-- bool "Intel StrongArm SA-110"
-- select ARCH_HAS_MMU
-- select HAS_THUMB
--
--config CONFIG_ARM_SA1100
-- bool "Intel StrongArm SA-1100"
-- select ARCH_HAS_MMU
-- select HAS_THUMB
--
--config CONFIG_ARM_XSCALE
-- bool "Intel Xscale"
-- select ARCH_HAS_MMU
-- select HAS_THUMB
--
--config CONFIG_ARM_IWMMXT
-- bool "Intel Xscale With WMMX PXA27x"
-- select ARCH_HAS_MMU
-- select HAS_THUMB
--
--endchoice
--
--config HAS_THUMB
-- bool
--
--config FORCE_THUMB
-- bool
-- select HAS_THUMB
-- select COMPILE_IN_THUMB_MODE
-- select USE_BX
--
- config COMPILE_IN_THUMB_MODE
-- bool
-+ bool "Build using Thumb mode"
-+ select USE_BX
-+ help
-+ Say 'y' here to force building uClibc in thumb mode.
-+ Say 'n' to use your compiler's default mode.
-
- config USE_BX
- bool "Use BX in function return"
-- default y
-- depends on HAS_THUMB
- help
- Use BX instruction for THUMB aware architectures.
---
-1.7.1
-
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/rtld_no.patch b/meta/recipes-core/uclibc/uclibc-0.9.32/rtld_no.patch
deleted file mode 100644
index 30cb7f6..0000000
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/rtld_no.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-Patch is backported from
-http://lists.busybox.net/pipermail/uclibc/2011-March/045004.html
-
-Upstream-Status: Pending
-
-diff --git a/ldso/include/dl-elf.h b/ldso/include/dl-elf.h
-index 7fbb373..7102351 100644
---- a/ldso/include/dl-elf.h
-+++ b/ldso/include/dl-elf.h
-@@ -25,16 +25,18 @@ static __inline__ void _dl_map_cache(void) { }
- static __inline__ void _dl_unmap_cache(void) { }
- #endif
-
-+#define DL_RESOLVE_SECURE 0x0001
-+#define DL_RESOLVE_NOLOAD 0x0002
-
- /* Function prototypes for non-static stuff in readelflib1.c */
- extern void _dl_parse_lazy_relocation_information(struct dyn_elf *rpnt,
- unsigned long rel_addr, unsigned long rel_size);
- extern int _dl_parse_relocation_information(struct dyn_elf *rpnt,
- unsigned long rel_addr, unsigned long rel_size);
--extern struct elf_resolve * _dl_load_shared_library(int secure,
-+extern struct elf_resolve * _dl_load_shared_library(int resolve_flags,
- struct dyn_elf **rpnt, struct elf_resolve *tpnt, char *full_libname,
- int trace_loaded_objects);
--extern struct elf_resolve * _dl_load_elf_shared_library(int secure,
-+extern struct elf_resolve * _dl_load_elf_shared_library(int resolve_flags,
- struct dyn_elf **rpnt, char *libname);
- extern struct elf_resolve *_dl_check_if_named_library_is_loaded(const char *full_libname,
- int trace_loaded_objects);
-diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c
-index 2b2d429..6d35bf2 100644
---- a/ldso/ldso/dl-elf.c
-+++ b/ldso/ldso/dl-elf.c
-@@ -132,7 +132,7 @@ _dl_protect_relro (struct elf_resolve *l)
- /* This function's behavior must exactly match that
- * in uClibc/ldso/util/ldd.c */
- static struct elf_resolve *
--search_for_named_library(const char *name, int secure, const char *path_list,
-+search_for_named_library(const char *name, int resolve_flags, const char *path_list,
- struct dyn_elf **rpnt, const char *origin)
- {
- char *mylibname;
-@@ -162,7 +162,7 @@ search_for_named_library(const char *name, int secure, const char *path_list,
-
- if (plen >= 7 && _dl_memcmp(p, "$ORIGIN", 7) == 0) {
- int olen;
-- if (secure && plen != 7)
-+ if ((resolve_flags & DL_RESOLVE_SECURE) && plen != 7)
- continue;
- if (origin == NULL)
- continue;
-@@ -182,7 +182,7 @@ search_for_named_library(const char *name, int secure, const char *path_list,
- _dl_strcat(mylibname, "/");
- _dl_strcat(mylibname, name);
-
-- tpnt = _dl_load_elf_shared_library(secure, rpnt, mylibname);
-+ tpnt = _dl_load_elf_shared_library(resolve_flags, rpnt, mylibname);
- if (tpnt != NULL)
- return tpnt;
- }
-@@ -194,7 +194,7 @@ search_for_named_library(const char *name, int secure, const char *path_list,
- unsigned long _dl_error_number;
- unsigned long _dl_internal_error_number;
-
--struct elf_resolve *_dl_load_shared_library(int secure, struct dyn_elf **rpnt,
-+struct elf_resolve *_dl_load_shared_library(int resolve_flags, struct dyn_elf **rpnt,
- struct elf_resolve *tpnt, char *full_libname, int attribute_unused trace_loaded_objects)
- {
- char *pnt;
-@@ -223,7 +223,7 @@ struct elf_resolve *_dl_load_shared_library(int secure, struct dyn_elf **rpnt,
-
- if (libname != full_libname) {
- _dl_if_debug_dprint("\ttrying file='%s'\n", full_libname);
-- tpnt1 = _dl_load_elf_shared_library(secure, rpnt, full_libname);
-+ tpnt1 = _dl_load_elf_shared_library(resolve_flags, rpnt, full_libname);
- if (tpnt1) {
- return tpnt1;
- }
-@@ -238,7 +238,7 @@ struct elf_resolve *_dl_load_shared_library(int secure, struct dyn_elf **rpnt,
- if (pnt) {
- pnt += (unsigned long) tpnt->dynamic_info[DT_STRTAB];
- _dl_if_debug_dprint("\tsearching RPATH='%s'\n", pnt);
-- if ((tpnt1 = search_for_named_library(libname, secure, pnt, rpnt,
-+ if ((tpnt1 = search_for_named_library(libname, resolve_flags, pnt, rpnt,
- tpnt->libname)) != NULL)
- return tpnt1;
- }
-@@ -247,7 +247,7 @@ struct elf_resolve *_dl_load_shared_library(int secure, struct dyn_elf **rpnt,
- /* Check in LD_{ELF_}LIBRARY_PATH, if specified and allowed */
- if (_dl_library_path) {
- _dl_if_debug_dprint("\tsearching LD_LIBRARY_PATH='%s'\n", _dl_library_path);
-- if ((tpnt1 = search_for_named_library(libname, secure, _dl_library_path, rpnt, NULL)) != NULL)
-+ if ((tpnt1 = search_for_named_library(libname, resolve_flags, _dl_library_path, rpnt, NULL)) != NULL)
- {
- return tpnt1;
- }
-@@ -261,7 +261,7 @@ struct elf_resolve *_dl_load_shared_library(int secure, struct dyn_elf **rpnt,
- if (pnt) {
- pnt += (unsigned long) tpnt->dynamic_info[DT_STRTAB];
- _dl_if_debug_dprint("\tsearching RUNPATH='%s'\n", pnt);
-- if ((tpnt1 = search_for_named_library(libname, secure, pnt, rpnt, NULL)) != NULL)
-+ if ((tpnt1 = search_for_named_library(libname, resolve_flags, pnt, rpnt, NULL)) != NULL)
- return tpnt1;
- }
- #endif
-@@ -284,7 +284,7 @@ struct elf_resolve *_dl_load_shared_library(int secure, struct dyn_elf **rpnt,
- || libent[i].flags == LIB_ELF_LIBC0
- || libent[i].flags == LIB_ELF_LIBC5)
- && _dl_strcmp(libname, strs + libent[i].sooffset) == 0
-- && (tpnt1 = _dl_load_elf_shared_library(secure, rpnt, strs + libent[i].liboffset))
-+ && (tpnt1 = _dl_load_elf_shared_library(resolve_flags, rpnt, strs + libent[i].liboffset))
- ) {
- return tpnt1;
- }
-@@ -295,14 +295,14 @@ struct elf_resolve *_dl_load_shared_library(int secure, struct dyn_elf **rpnt,
- /* Look for libraries wherever the shared library loader
- * was installed */
- _dl_if_debug_dprint("\tsearching ldso dir='%s'\n", _dl_ldsopath);
-- tpnt1 = search_for_named_library(libname, secure, _dl_ldsopath, rpnt, NULL);
-+ tpnt1 = search_for_named_library(libname, resolve_flags, _dl_ldsopath, rpnt, NULL);
- if (tpnt1 != NULL)
- return tpnt1;
-
- /* Lastly, search the standard list of paths for the library.
- This list must exactly match the list in uClibc/ldso/util/ldd.c */
- _dl_if_debug_dprint("\tsearching full lib path list\n");
-- tpnt1 = search_for_named_library(libname, secure,
-+ tpnt1 = search_for_named_library(libname, resolve_flags,
- UCLIBC_RUNTIME_PREFIX "lib:"
- UCLIBC_RUNTIME_PREFIX "usr/lib"
- #ifndef __LDSO_CACHE_SUPPORT__
-@@ -329,7 +329,7 @@ goof:
- * are required.
- */
-
--struct elf_resolve *_dl_load_elf_shared_library(int secure,
-+struct elf_resolve *_dl_load_elf_shared_library(int resolve_flags,
- struct dyn_elf **rpnt, char *libname)
- {
- ElfW(Ehdr) *epnt;
-@@ -368,7 +368,7 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
- }
- /* If we are in secure mode (i.e. a setu/gid binary using LD_PRELOAD),
- we don't load the library if it isn't setuid. */
-- if (secure) {
-+ if (resolve_flags & DL_RESOLVE_SECURE) {
- if (!(st.st_mode & S_ISUID)) {
- _dl_close(infile);
- return NULL;
-@@ -384,6 +384,10 @@ struct elf_resolve *_dl_load_elf_shared_library(int secure,
- return tpnt;
- }
- }
-+ if (resolve_flags & DL_RESOLVE_NOLOAD) {
-+ _dl_close(infile);
-+ return NULL;
-+ }
- header = _dl_mmap((void *) 0, _dl_pagesize, PROT_READ | PROT_WRITE,
- MAP_PRIVATE | MAP_ANONYMOUS | MAP_UNINITIALIZE, -1, 0);
- if (_dl_mmap_check_error(header)) {
-diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c
-index 9423670..b71af34 100644
---- a/ldso/ldso/ldso.c
-+++ b/ldso/ldso/ldso.c
-@@ -646,7 +646,9 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
- if (!_dl_secure || _dl_strchr(str, '/') == NULL) {
- _dl_if_debug_dprint("\tfile='%s'; needed by '%s'\n", str, _dl_progname);
-
-- tpnt1 = _dl_load_shared_library(_dl_secure, &rpnt, NULL, str, trace_loaded_objects);
-+ tpnt1 = _dl_load_shared_library(
-+ _dl_secure ? DL_RESOLVE_SECURE : 0,
-+ &rpnt, NULL, str, trace_loaded_objects);
- if (!tpnt1) {
- #ifdef __LDSO_LDD_SUPPORT__
- if (trace_loaded_objects)
-diff --git a/ldso/libdl/libdl.c b/ldso/libdl/libdl.c
-index 68cd579..edf38d2 100644
---- a/ldso/libdl/libdl.c
-+++ b/ldso/libdl/libdl.c
-@@ -288,7 +288,7 @@ void *dlopen(const char *libname, int flag)
- #endif
-
- /* A bit of sanity checking... */
-- if (!(flag & (RTLD_LAZY|RTLD_NOW))) {
-+ if (!(flag & (RTLD_LAZY|RTLD_NOW|RTLD_NOLOAD))) {
- _dl_error_number = LD_BAD_HANDLE;
- return NULL;
- }
-@@ -358,8 +358,9 @@ void *dlopen(const char *libname, int flag)
- /* Try to load the specified library */
- _dl_if_debug_print("Trying to dlopen '%s', RTLD_GLOBAL:%d RTLD_NOW:%d\n",
- (char*)libname, (flag & RTLD_GLOBAL ? 1:0), (now_flag & RTLD_NOW ? 1:0));
-- tpnt = _dl_load_shared_library(0, &rpnt, tfrom, (char*)libname, 0);
-
-+ tpnt = _dl_load_shared_library((flag & RTLD_NOLOAD) ? DL_RESOLVE_NOLOAD : 0,
-+ &rpnt, tfrom, (char*)libname, 0);
- if (tpnt == NULL) {
- _dl_unmap_cache();
- return NULL;
-diff --git a/libc/sysdeps/linux/common/bits/dlfcn.h b/libc/sysdeps/linux/common/bits/dlfcn.h
-index 4bfbbff..47b42ad 100644
---- a/libc/sysdeps/linux/common/bits/dlfcn.h
-+++ b/libc/sysdeps/linux/common/bits/dlfcn.h
-@@ -24,9 +24,9 @@
- /* The MODE argument to `dlopen' contains one of the following: */
- #define RTLD_LAZY 0x00001 /* Lazy function call binding. */
- #define RTLD_NOW 0x00002 /* Immediate function call binding. */
--#if 0 /* uClibc doesnt support these */
--#define RTLD_BINDING_MASK 0x3 /* Mask of binding time value. */
-+#define RTLD_BINDING_MASK 0x3 /* Mask of binding time value. */
- #define RTLD_NOLOAD 0x00004 /* Do not load the object. */
-+#if 0 /* uClibc doesnt support these */
- #define RTLD_DEEPBIND 0x00008 /* Use deep binding. */
- #endif
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/select-force-thumb.patch b/meta/recipes-core/uclibc/uclibc-0.9.32/select-force-thumb.patch
deleted file mode 100644
index b19408f..0000000
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/select-force-thumb.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-Delivered-To: raj.khem@gmail.com
-Received: by 10.90.86.4 with SMTP id j4cs313301agb;
- Sat, 8 Jan 2011 16:45:17 -0800 (PST)
-Received: by 10.216.186.82 with SMTP id v60mr20017574wem.56.1294533916559;
- Sat, 08 Jan 2011 16:45:16 -0800 (PST)
-Return-Path: <yann.morin.1998@anciens.enib.fr>
-Received: from smtp.smtpout.orange.fr (smtp01.smtpout.orange.fr [80.12.242.123])
- by mx.google.com with ESMTP id o13si33755824wee.56.2011.01.08.16.45.16;
- Sat, 08 Jan 2011 16:45:16 -0800 (PST)
-Received-SPF: neutral (google.com: 80.12.242.123 is neither permitted nor denied by best guess record for domain of yann.morin.1998@anciens.enib.fr) client-ip=80.12.242.123;
-Authentication-Results: mx.google.com; spf=neutral (google.com: 80.12.242.123 is neither permitted nor denied by best guess record for domain of yann.morin.1998@anciens.enib.fr) smtp.mail=yann.morin.1998@anciens.enib.fr
-Received: from roazhon.bzh.lan ([90.32.245.227])
- by mwinf5d24 with ME
- id tClC1f0024v5z3u03ClFDL; Sun, 09 Jan 2011 01:45:16 +0100
-From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
-To: uclibc@uclibc.org
-Cc: Khem Raj <raj.khem@gmail.com>,
- Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>,
- Carmelo AMOROSO <carmelo.amoroso@st.com>
-Subject: [PATCH 2/7] ARM: introduce blind options to select & force THUMB mode
-Date: Sun, 9 Jan 2011 01:45:05 +0100
-Message-Id: <1294533910-19305-3-git-send-email-yann.morin.1998@anciens.enib.fr>
-X-Mailer: git-send-email 1.7.1
-In-Reply-To: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>
-References: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>
-
-Add three new blind options to set use of Thumb mode:
-- COMPILE_IN_THUMB_MODE
- - if set, CFLAGS will contain -mthumb
- - if unset, the compiler's default is used
-- HAS_THUMB
- - CPUS with Thumb instruction set can select this
- - use of BX depends on this
-- FORCE_THUMB
- - CPUs that are Thumb-only must select this
- - this selects: HAS_THUMB, COMPILE_IN_THUMB_MODE and USE_BX
-
-Also, remove leading space in Rules.mak.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
-Cc: Khem Raj <raj.khem@gmail.com>
-Cc: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
-Cc: Carmelo AMOROSO <carmelo.amoroso@st.com>
----
- Rules.mak | 7 ++++---
- extra/Configs/Config.arm | 31 ++++++++++++++++++++++++++++---
- 2 files changed, 32 insertions(+), 6 deletions(-)
-
-diff --git a/Rules.mak b/Rules.mak
-index eecdc64..2a16908 100644
---- a/Rules.mak
-+++ b/Rules.mak
-@@ -348,9 +348,10 @@ ifeq ($(TARGET_ARCH),arm)
- CPU_CFLAGS-$(CONFIG_ARM_SA1100)+=-mtune=strongarm1100 -march=armv4
- CPU_CFLAGS-$(CONFIG_ARM_XSCALE)+=$(call check_gcc,-mtune=xscale,-mtune=strongarm110)
- CPU_CFLAGS-$(CONFIG_ARM_XSCALE)+=-march=armv5te -Wa,-mcpu=xscale
-- CPU_CFLAGS-$(CONFIG_ARM_IWMMXT)+=-march=iwmmxt -Wa,-mcpu=iwmmxt -mabi=iwmmxt
-- CPU_CFLAGS-$(CONFIG_ARM_CORTEX_M3)+=-mcpu=cortex-m3 -mthumb
-- CPU_CFLAGS-$(CONFIG_ARM_CORTEX_M1)+=-mcpu=cortex-m1 -mthumb
-+ CPU_CFLAGS-$(CONFIG_ARM_IWMMXT)+=-march=iwmmxt -Wa,-mcpu=iwmmxt -mabi=iwmmxt
-+ CPU_CFLAGS-$(CONFIG_ARM_CORTEX_M3)+=-mcpu=cortex-m3
-+ CPU_CFLAGS-$(CONFIG_ARM_CORTEX_M1)+=-mcpu=cortex-m1
-+ CPU_CFLAGS-$(COMPILE_IN_THUMB_MODE)+=-mthumb
- endif
-
- ifeq ($(TARGET_ARCH),mips)
-diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm
-index 3b90e67..c9c40d4 100644
---- a/extra/Configs/Config.arm
-+++ b/extra/Configs/Config.arm
-@@ -64,70 +64,95 @@ config CONFIG_ARM710
- config CONFIG_ARM7TDMI
- bool "Arm 7TDMI"
- select ARCH_HAS_NO_MMU
-+ select HAS_THUMB
-
- config CONFIG_ARM720T
- bool "Arm 720T"
- select ARCH_HAS_MMU
-+ select HAS_THUMB
-
- config CONFIG_ARM920T
- bool "Arm 920T"
- select ARCH_HAS_MMU
-+ select HAS_THUMB
-
- config CONFIG_ARM922T
- bool "Arm 922T"
- select ARCH_HAS_MMU
-+ select HAS_THUMB
-
- config CONFIG_ARM926T
- bool "Arm 926T"
- select ARCH_HAS_MMU
-+ select HAS_THUMB
-
- config CONFIG_ARM10T
- bool "Arm 10T"
- select ARCH_HAS_MMU
-+ select HAS_THUMB
-
- config CONFIG_ARM1136JF_S
- bool "Arm 1136JF-S"
- select ARCH_HAS_MMU
-+ select HAS_THUMB
-
- config CONFIG_ARM1176JZ_S
- bool "Arm 1176JZ-S"
- select ARCH_HAS_MMU
-+ select HAS_THUMB
-
- config CONFIG_ARM1176JZF_S
- bool "Arm 1176JZF-S"
- select ARCH_HAS_MMU
-+ select HAS_THUMB
-
- config CONFIG_ARM_CORTEX_M3
- bool "Arm Cortex-M3"
- select ARCH_HAS_NO_MMU
-- select USE_BX
-+ select FORCE_THUMB
-
- config CONFIG_ARM_CORTEX_M1
- bool "Arm Cortex-M1"
- select ARCH_HAS_NO_MMU
-- select USE_BX
-+ select FORCE_THUMB
-
- config CONFIG_ARM_SA110
- bool "Intel StrongArm SA-110"
- select ARCH_HAS_MMU
-+ select HAS_THUMB
-
- config CONFIG_ARM_SA1100
- bool "Intel StrongArm SA-1100"
- select ARCH_HAS_MMU
-+ select HAS_THUMB
-
- config CONFIG_ARM_XSCALE
- bool "Intel Xscale"
- select ARCH_HAS_MMU
-+ select HAS_THUMB
-
- config CONFIG_ARM_IWMMXT
- bool "Intel Xscale With WMMX PXA27x"
- select ARCH_HAS_MMU
-+ select HAS_THUMB
-
- endchoice
-
-+config HAS_THUMB
-+ bool
-+
-+config FORCE_THUMB
-+ bool
-+ select HAS_THUMB
-+ select COMPILE_IN_THUMB_MODE
-+ select USE_BX
-+
-+config COMPILE_IN_THUMB_MODE
-+ bool
-+
- config USE_BX
- bool "Use BX in function return"
- default y
-- depends on !CONFIG_GENERIC_ARM && !CONFIG_ARM610 && !CONFIG_ARM710
-+ depends on HAS_THUMB
- help
- Use BX instruction for THUMB aware architectures.
---
-1.7.1
-
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/sync_file_range2.patch b/meta/recipes-core/uclibc/uclibc-0.9.32/sync_file_range2.patch
deleted file mode 100644
index 4b85a43..0000000
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/sync_file_range2.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Some architectures like ppc, arm use aligned 64 bit inputs so a register is not wasted
-this then uses __NR_sync_file_range2 syscall. Implement is
-
-Singed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Pending
-
-Index: git/libc/sysdeps/linux/common/sync_file_range.c
-===================================================================
---- git.orig/libc/sysdeps/linux/common/sync_file_range.c 2011-07-19 14:23:35.000000000 -0700
-+++ git/libc/sysdeps/linux/common/sync_file_range.c 2011-07-19 15:04:38.631808666 -0700
-@@ -11,7 +11,8 @@
- #if defined __USE_GNU
- #include <fcntl.h>
-
--#if defined __NR_sync_file_range && defined __UCLIBC_HAS_LFS__
-+#if defined __UCLIBC_HAS_LFS__
-+#if defined __NR_sync_file_range
- #define __NR___syscall_sync_file_range __NR_sync_file_range
- static __inline__ _syscall6(int, __syscall_sync_file_range, int, fd,
- off_t, offset_hi, off_t, offset_lo,
-@@ -23,5 +24,23 @@
- __LONG_LONG_PAIR((long)(nbytes >> 32), (long)(nbytes & 0xffffffff)),
- flags);
- }
--#endif
--#endif
-+#elif defined __NR_sync_file_range2
-+#define __NR___syscall_sync_file_range2 __NR_sync_file_range2
-+static __inline__ _syscall6(int, __syscall_sync_file_range2, int, fd,
-+ unsigned int, flags, off_t, offset_hi, off_t, offset_lo,
-+ off_t, nbytes_hi, off_t, nbytes_lo)
-+int sync_file_range(int fd, off64_t offset, off64_t nbytes, unsigned int flags)
-+{
-+ return __syscall_sync_file_range2(fd, flags,
-+ __LONG_LONG_PAIR((long)(offset >> 32), (long)(offset & 0xffffffff)),
-+ __LONG_LONG_PAIR((long)(nbytes >> 32), (long)(nbytes & 0xffffffff)));
-+}
-+#else
-+int sync_file_range(int fd, off64_t offset, off64_t nbytes, unsigned int flags)
-+{
-+ __set_errno (ENOSYS);
-+ return -1
-+}
-+#endif /* __NR_sync_file_range */
-+#endif /* __UCLIBC_HAS_LFS__ */
-+#endif /* __USE_GNU */
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/transform-eabi-oabi-choice.patch b/meta/recipes-core/uclibc/uclibc-0.9.32/transform-eabi-oabi-choice.patch
deleted file mode 100644
index 82970ca..0000000
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/transform-eabi-oabi-choice.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Delivered-To: raj.khem@gmail.com
-Received: by 10.90.86.4 with SMTP id j4cs313305agb;
- Sat, 8 Jan 2011 16:45:19 -0800 (PST)
-Received: by 10.216.153.210 with SMTP id f60mr573848wek.114.1294533918335;
- Sat, 08 Jan 2011 16:45:18 -0800 (PST)
-Return-Path: <yann.morin.1998@anciens.enib.fr>
-Received: from smtp.smtpout.orange.fr (smtp01.smtpout.orange.fr [80.12.242.123])
- by mx.google.com with ESMTP id n4si33737071wej.152.2011.01.08.16.45.17;
- Sat, 08 Jan 2011 16:45:18 -0800 (PST)
-Received-SPF: neutral (google.com: 80.12.242.123 is neither permitted nor denied by best guess record for domain of yann.morin.1998@anciens.enib.fr) client-ip=80.12.242.123;
-Authentication-Results: mx.google.com; spf=neutral (google.com: 80.12.242.123 is neither permitted nor denied by best guess record for domain of yann.morin.1998@anciens.enib.fr) smtp.mail=yann.morin.1998@anciens.enib.fr
-Received: from roazhon.bzh.lan ([90.32.245.227])
- by mwinf5d24 with ME
- id tClC1f0024v5z3u03ClGDX; Sun, 09 Jan 2011 01:45:17 +0100
-From: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
-To: uclibc@uclibc.org
-Cc: Khem Raj <raj.khem@gmail.com>,
- Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>,
- Carmelo AMOROSO <carmelo.amoroso@st.com>
-Subject: [PATCH 4/7] ARM: transform the EABI/OABI choice into a boolean
-Date: Sun, 9 Jan 2011 01:45:07 +0100
-Message-Id: <1294533910-19305-5-git-send-email-yann.morin.1998@anciens.enib.fr>
-X-Mailer: git-send-email 1.7.1
-In-Reply-To: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>
-References: <1294533910-19305-1-git-send-email-yann.morin.1998@anciens.enib.fr>
-
-The CONFIG_ARM_OABI option is never used.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
-Cc: Khem Raj <raj.khem@gmail.com>
-Cc: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
-Cc: Carmelo AMOROSO <carmelo.amoroso@st.com>
----
- extra/Configs/Config.arm | 23 ++++++++---------------
- 1 files changed, 8 insertions(+), 15 deletions(-)
-
-Index: git/extra/Configs/Config.arm
-===================================================================
---- git.orig/extra/Configs/Config.arm
-+++ git/extra/Configs/Config.arm
-@@ -12,23 +12,16 @@ config FORCE_OPTIONS_FOR_ARCH
- default y
- select ARCH_ANY_ENDIAN
-
--choice
-- prompt "Target ABI"
-- default CONFIG_ARM_EABI
-+config CONFIG_ARM_EABI
-+ bool "Build for EABI"
- help
-- If you choose "EABI" here, functions and constants required by the
-- ARM EABI will be built into the library. You should choose "EABI"
-+ If you say 'y' here, functions and constants required by the
-+ ARM EABI will be built into the library. You should say 'y'
- if your compiler uses the ARM EABI, in which case you will also
-- need a kernel supporting the EABI system call interface, or "OABI"
-- for a compiler using the old Linux ABI.
--
--config CONFIG_ARM_OABI
-- bool "OABI"
--
--config CONFIG_ARM_EABI
-- bool "EABI"
-+ need a kernel supporting the EABI system call interface.
-
--endchoice
-+ If you say 'n' here, then the library will be built for the
-+ old Linux ABI.
-
- config COMPILE_IN_THUMB_MODE
- bool "Build using Thumb mode"
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/uclibc-arm-ftruncate64.patch b/meta/recipes-core/uclibc/uclibc-0.9.32/uclibc-arm-ftruncate64.patch
deleted file mode 100644
index 504d37b..0000000
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/uclibc-arm-ftruncate64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: uclibc-0.9.29/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h
-===================================================================
---- uclibc-0.9.29.orig/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h
-+++ uclibc-0.9.29/libc/sysdeps/linux/arm/bits/uClibc_arch_features.h
-@@ -38,4 +38,8 @@
- /* define if target supports IEEE signed zero floats */
- #define __UCLIBC_HAVE_SIGNED_ZERO__
-
-+#ifdef __ARM_EABI__
-+# define __UCLIBC_TRUNCATE64_HAS_4_ARGS__
-+#endif
-+
- #endif /* _BITS_UCLIBC_ARCH_FEATURES_H */
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/uclibc_scheduler_update.patch b/meta/recipes-core/uclibc/uclibc-0.9.32/uclibc_scheduler_update.patch
deleted file mode 100644
index 78401bd..0000000
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/uclibc_scheduler_update.patch
+++ /dev/null
@@ -1,455 +0,0 @@
-From 2becc16ecbef71c496644d9dc6cbd7383d7cdca3 Mon Sep 17 00:00:00 2001
-From: Henning Heinold <heinold@inf.fu-berlin.de>
-Date: Sat, 4 Jun 2011 21:21:41 +0200
-Subject: [PATCH 1/2] libc: updates the linux scheduler functions, most stuff
- was taken from the eglibc
-
-
-Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>
----
- include/sched.h | 52 ++++++++++++----
- libc/sysdeps/linux/common/Makefile.in | 4 +-
- libc/sysdeps/linux/common/bits/sched.h | 96 +++++++++++++++++++++++-----
- libc/sysdeps/linux/common/sched_cpualloc.c | 27 ++++++++
- libc/sysdeps/linux/common/sched_cpucount.c | 60 +++++++++++++++++
- libc/sysdeps/linux/common/sched_cpufree.c | 27 ++++++++
- libc/sysdeps/linux/common/sched_getcpu.c | 37 +++++++++++
- libc/sysdeps/linux/common/unshare.c | 12 ++++
- 8 files changed, 286 insertions(+), 29 deletions(-)
- create mode 100644 libc/sysdeps/linux/common/sched_cpualloc.c
- create mode 100644 libc/sysdeps/linux/common/sched_cpucount.c
- create mode 100644 libc/sysdeps/linux/common/sched_cpufree.c
- create mode 100644 libc/sysdeps/linux/common/sched_getcpu.c
- create mode 100644 libc/sysdeps/linux/common/unshare.c
-
-diff --git a/include/sched.h b/include/sched.h
-index 0d110c3..e265b84 100644
---- a/include/sched.h
-+++ b/include/sched.h
-@@ -1,5 +1,5 @@
- /* Definitions for POSIX 1003.1b-1993 (aka POSIX.4) scheduling interface.
-- Copyright (C) 1996,1997,1999,2001-2003,2004 Free Software Foundation, Inc.
-+ Copyright (C) 1996,1997,1999,2001-2004,2007 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
-@@ -25,6 +25,9 @@
- /* Get type definitions. */
- #include <bits/types.h>
-
-+#define __need_size_t
-+#include <stddef.h>
-+
- #define __need_timespec
- #include <time.h>
-
-@@ -65,11 +68,42 @@ extern int sched_rr_get_interval (__pid_t __pid, struct timespec *__t) __THROW;
-
- #if defined __USE_GNU && defined __UCLIBC_LINUX_SPECIFIC__
- /* Access macros for `cpu_set'. */
--#define CPU_SETSIZE __CPU_SETSIZE
--#define CPU_SET(cpu, cpusetp) __CPU_SET (cpu, cpusetp)
--#define CPU_CLR(cpu, cpusetp) __CPU_CLR (cpu, cpusetp)
--#define CPU_ISSET(cpu, cpusetp) __CPU_ISSET (cpu, cpusetp)
--#define CPU_ZERO(cpusetp) __CPU_ZERO (cpusetp)
-+# define CPU_SETSIZE __CPU_SETSIZE
-+# define CPU_SET(cpu, cpusetp) __CPU_SET_S (cpu, sizeof (cpu_set_t), cpusetp)
-+# define CPU_CLR(cpu, cpusetp) __CPU_CLR_S (cpu, sizeof (cpu_set_t), cpusetp)
-+# define CPU_ISSET(cpu, cpusetp) __CPU_ISSET_S (cpu, sizeof (cpu_set_t), \
-+ cpusetp)
-+# define CPU_ZERO(cpusetp) __CPU_ZERO_S (sizeof (cpu_set_t), cpusetp)
-+# define CPU_COUNT(cpusetp) __CPU_COUNT_S (sizeof (cpu_set_t), cpusetp)
-+
-+# define CPU_SET_S(cpu, setsize, cpusetp) __CPU_SET_S (cpu, setsize, cpusetp)
-+# define CPU_CLR_S(cpu, setsize, cpusetp) __CPU_CLR_S (cpu, setsize, cpusetp)
-+# define CPU_ISSET_S(cpu, setsize, cpusetp) __CPU_ISSET_S (cpu, setsize, \
-+ cpusetp)
-+# define CPU_ZERO_S(setsize, cpusetp) __CPU_ZERO_S (setsize, cpusetp)
-+# define CPU_COUNT_S(setsize, cpusetp) __CPU_COUNT_S (setsize, cpusetp)
-+
-+# define CPU_EQUAL(cpusetp1, cpusetp2) \
-+ __CPU_EQUAL_S (sizeof (cpu_set_t), cpusetp1, cpusetp2)
-+# define CPU_EQUAL_S(setsize, cpusetp1, cpusetp2) \
-+ __CPU_EQUAL_S (setsize, cpusetp1, cpusetp2)
-+
-+# define CPU_AND(destset, srcset1, srcset2) \
-+ __CPU_OP_S (sizeof (cpu_set_t), destset, srcset1, srcset2, &)
-+# define CPU_OR(destset, srcset1, srcset2) \
-+ __CPU_OP_S (sizeof (cpu_set_t), destset, srcset1, srcset2, |)
-+# define CPU_XOR(destset, srcset1, srcset2) \
-+ __CPU_OP_S (sizeof (cpu_set_t), destset, srcset1, srcset2, ^)
-+# define CPU_AND_S(setsize, destset, srcset1, srcset2) \
-+ __CPU_OP_S (setsize, destset, srcset1, srcset2, &)
-+# define CPU_OR_S(setsize, destset, srcset1, srcset2) \
-+ __CPU_OP_S (setsize, destset, srcset1, srcset2, |)
-+# define CPU_XOR_S(setsize, destset, srcset1, srcset2) \
-+ __CPU_OP_S (setsize, destset, srcset1, srcset2, ^)
-+
-+# define CPU_ALLOC_SIZE(count) __CPU_ALLOC_SIZE (count)
-+# define CPU_ALLOC(count) __CPU_ALLOC (count)
-+# define CPU_FREE(cpuset) __CPU_FREE (cpuset)
-
-
- /* Set the CPU affinity for a task */
-@@ -79,12 +113,6 @@ extern int sched_setaffinity (__pid_t __pid, size_t __cpusetsize,
- /* Get the CPU affinity for a task */
- extern int sched_getaffinity (__pid_t __pid, size_t __cpusetsize,
- cpu_set_t *__cpuset) __THROW;
--
--extern int __clone (int (*__fn) (void *__arg), void *__child_stack,
-- int __flags, void *__arg, ...);
--extern int __clone2 (int (*__fn) (void *__arg), void *__child_stack_base,
-- size_t __child_stack_size, int __flags, void *__arg, ...);
--
- #endif
-
- __END_DECLS
-diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in
-index 8f936ff..cb8c153 100644
---- a/libc/sysdeps/linux/common/Makefile.in
-+++ b/libc/sysdeps/linux/common/Makefile.in
-@@ -22,9 +22,11 @@ CSRC-$(UCLIBC_LINUX_SPECIFIC) += capget.c capset.c inotify.c ioperm.c iopl.c \
- modify_ldt.c pipe2.c personality.c ppoll.c prctl.c \
- readahead.c reboot.c \
- remap_file_pages.c sched_getaffinity.c sched_setaffinity.c \
-+ sched_cpualloc.c sched_cpucount.c sched_cpufree.c \
- sendfile64.c sendfile.c setfsgid.c setfsuid.c setresuid.c \
- splice.c vmsplice.c tee.c signalfd.c swapoff.c swapon.c \
-- sync_file_range.c sysctl.c sysinfo.c timerfd.c uselib.c vhangup.c
-+ sync_file_range.c sysctl.c sysinfo.c timerfd.c unshare.c \
-+ uselib.c vhangup.c
- # NPTL needs these internally: madvise.c
- CSRC-$(findstring y,$(UCLIBC_LINUX_SPECIFIC)$(UCLIBC_HAS_THREADS_NATIVE)) += madvise.c
- ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
-diff --git a/libc/sysdeps/linux/common/bits/sched.h b/libc/sysdeps/linux/common/bits/sched.h
-index b48a0c8..fea66a8 100644
---- a/libc/sysdeps/linux/common/bits/sched.h
-+++ b/libc/sysdeps/linux/common/bits/sched.h
-@@ -1,6 +1,7 @@
- /* Definitions of constants and data structure for POSIX 1003.1b-1993
- scheduling interface.
-- Copyright (C) 1996-1999,2001-2003,2005,2006 Free Software Foundation, Inc.
-+ Copyright (C) 1996-1999,2001-2003,2005,2006,2007,2008
-+ Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
-@@ -58,7 +59,13 @@
- force CLONE_PTRACE on this clone. */
- # define CLONE_CHILD_SETTID 0x01000000 /* Store TID in userlevel buffer in
- the child. */
--# define CLONE_STOPPED 0x02000000 /* Start in stopped state. */
-+# define CLONE_STOPPED 0x02000000 /* Start in stopped state. */
-+# define CLONE_NEWUTS 0x04000000 /* New utsname group. */
-+# define CLONE_NEWIPC 0x08000000 /* New ipcs. */
-+# define CLONE_NEWUSER 0x10000000 /* New user namespace. */
-+# define CLONE_NEWPID 0x20000000 /* New pid namespace. */
-+# define CLONE_NEWNET 0x40000000 /* New network namespace. */
-+# define CLONE_IO 0x80000000 /* Clone I/O context. */
- #endif
-
- /* The official definition. */
-@@ -74,10 +81,11 @@ __BEGIN_DECLS
- extern int clone (int (*__fn) (void *__arg), void *__child_stack,
- int __flags, void *__arg, ...) __THROW;
-
--#if 0
- /* Unshare the specified resources. */
- extern int unshare (int __flags) __THROW;
--#endif
-+
-+/* Get index of currently used CPU. */
-+extern int sched_getcpu (void) __THROW;
- #endif
-
- __END_DECLS
-@@ -102,7 +110,7 @@ struct __sched_param
- # define __CPU_SETSIZE 1024
- # define __NCPUBITS (8 * sizeof (__cpu_mask))
-
--/* Type for array elements in 'cpu_set'. */
-+/* Type for array elements in 'cpu_set_t'. */
- typedef unsigned long int __cpu_mask;
-
- /* Basic access functions. */
-@@ -116,17 +124,73 @@ typedef struct
- } cpu_set_t;
-
- /* Access functions for CPU masks. */
--# define __CPU_ZERO(cpusetp) \
-+# define __CPU_ZERO_S(setsize, cpusetp) \
- do { \
-- unsigned int __i; \
-- cpu_set_t *__arr = (cpusetp); \
-- for (__i = 0; __i < sizeof (cpu_set_t) / sizeof (__cpu_mask); ++__i) \
-- __arr->__bits[__i] = 0; \
-+ size_t __i; \
-+ size_t __imax = (setsize) / sizeof (__cpu_mask); \
-+ __cpu_mask *__bits = (cpusetp)->__bits; \
-+ for (__i = 0; __i < __imax; ++__i) \
-+ __bits[__i] = 0; \
- } while (0)
--# define __CPU_SET(cpu, cpusetp) \
-- ((cpusetp)->__bits[__CPUELT (cpu)] |= __CPUMASK (cpu))
--# define __CPU_CLR(cpu, cpusetp) \
-- ((cpusetp)->__bits[__CPUELT (cpu)] &= ~__CPUMASK (cpu))
--# define __CPU_ISSET(cpu, cpusetp) \
-- (((cpusetp)->__bits[__CPUELT (cpu)] & __CPUMASK (cpu)) != 0)
-+# define __CPU_SET_S(cpu, setsize, cpusetp) \
-+ (__extension__ \
-+ ({ size_t __cpu = (cpu); \
-+ __cpu < 8 * (setsize) \
-+ ? (((__cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)] \
-+ |= __CPUMASK (__cpu)) \
-+ : 0; }))
-+# define __CPU_CLR_S(cpu, setsize, cpusetp) \
-+ (__extension__ \
-+ ({ size_t __cpu = (cpu); \
-+ __cpu < 8 * (setsize) \
-+ ? (((__cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)] \
-+ &= ~__CPUMASK (__cpu)) \
-+ : 0; }))
-+# define __CPU_ISSET_S(cpu, setsize, cpusetp) \
-+ (__extension__ \
-+ ({ size_t __cpu = (cpu); \
-+ __cpu < 8 * (setsize) \
-+ ? ((((__cpu_mask *) ((cpusetp)->__bits))[__CPUELT (__cpu)] \
-+ & __CPUMASK (__cpu))) != 0 \
-+ : 0; }))
-+
-+# define __CPU_COUNT_S(setsize, cpusetp) \
-+ __sched_cpucount (setsize, cpusetp)
-+
-+# define __CPU_EQUAL_S(setsize, cpusetp1, cpusetp2) \
-+ (__extension__ \
-+ ({ __cpu_mask *__arr1 = (cpusetp1)->__bits; \
-+ __cpu_mask *__arr2 = (cpusetp2)->__bits; \
-+ size_t __imax = (setsize) / sizeof (__cpu_mask); \
-+ size_t __i; \
-+ for (__i = 0; __i < __imax; ++__i) \
-+ if (__arr1[__i] != __arr2[__i]) \
-+ break; \
-+ __i == __imax; }))
-+
-+# define __CPU_OP_S(setsize, destset, srcset1, srcset2, op) \
-+ (__extension__ \
-+ ({ cpu_set_t *__dest = (destset); \
-+ __cpu_mask *__arr1 = (srcset1)->__bits; \
-+ __cpu_mask *__arr2 = (srcset2)->__bits; \
-+ size_t __imax = (setsize) / sizeof (__cpu_mask); \
-+ size_t __i; \
-+ for (__i = 0; __i < __imax; ++__i) \
-+ ((__cpu_mask *) __dest->__bits)[__i] = __arr1[__i] op __arr2[__i]; \
-+ __dest; }))
-+
-+# define __CPU_ALLOC_SIZE(count) \
-+ ((((count) + __NCPUBITS - 1) / __NCPUBITS) * sizeof (__cpu_mask))
-+# define __CPU_ALLOC(count) __sched_cpualloc (count)
-+# define __CPU_FREE(cpuset) __sched_cpufree (cpuset)
-+
-+__BEGIN_DECLS
-+
-+extern int __sched_cpucount (size_t __setsize, const cpu_set_t *__setp)
-+ __THROW;
-+extern cpu_set_t *__sched_cpualloc (size_t __count) __THROW __wur;
-+extern void __sched_cpufree (cpu_set_t *__set) __THROW;
-+
-+__END_DECLS
-+
- #endif
-diff --git a/libc/sysdeps/linux/common/sched_cpualloc.c b/libc/sysdeps/linux/common/sched_cpualloc.c
-new file mode 100644
-index 0000000..2642a80
---- /dev/null
-+++ b/libc/sysdeps/linux/common/sched_cpualloc.c
-@@ -0,0 +1,27 @@
-+/* Copyright (C) 2007 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, write to the Free
-+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+ 02111-1307 USA. */
-+
-+#include <sched.h>
-+#include <stdlib.h>
-+
-+
-+cpu_set_t *
-+__sched_cpualloc (size_t count)
-+{
-+ return malloc (CPU_ALLOC_SIZE (count));
-+}
-diff --git a/libc/sysdeps/linux/common/sched_cpucount.c b/libc/sysdeps/linux/common/sched_cpucount.c
-new file mode 100644
-index 0000000..331c0b8
---- /dev/null
-+++ b/libc/sysdeps/linux/common/sched_cpucount.c
-@@ -0,0 +1,60 @@
-+/* Copyright (C) 2007 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, write to the Free
-+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+ 02111-1307 USA. */
-+
-+#include <limits.h>
-+#include <sched.h>
-+
-+
-+int
-+__sched_cpucount (size_t setsize, const cpu_set_t *setp)
-+{
-+ int s = 0;
-+ const __cpu_mask *p = setp->__bits;
-+ const __cpu_mask *end = &setp->__bits[setsize / sizeof (__cpu_mask)];
-+
-+ while (p < end)
-+ {
-+ __cpu_mask l = *p++;
-+
-+#ifdef POPCNT
-+ s += POPCNT (l);
-+#else
-+ if (l == 0)
-+ continue;
-+
-+# if LONG_BIT > 32
-+ l = (l & 0x5555555555555555ul) + ((l >> 1) & 0x5555555555555555ul);
-+ l = (l & 0x3333333333333333ul) + ((l >> 2) & 0x3333333333333333ul);
-+ l = (l & 0x0f0f0f0f0f0f0f0ful) + ((l >> 4) & 0x0f0f0f0f0f0f0f0ful);
-+ l = (l & 0x00ff00ff00ff00fful) + ((l >> 8) & 0x00ff00ff00ff00fful);
-+ l = (l & 0x0000ffff0000fffful) + ((l >> 16) & 0x0000ffff0000fffful);
-+ l = (l & 0x00000000fffffffful) + ((l >> 32) & 0x00000000fffffffful);
-+# else
-+ l = (l & 0x55555555ul) + ((l >> 1) & 0x55555555ul);
-+ l = (l & 0x33333333ul) + ((l >> 2) & 0x33333333ul);
-+ l = (l & 0x0f0f0f0ful) + ((l >> 4) & 0x0f0f0f0ful);
-+ l = (l & 0x00ff00fful) + ((l >> 8) & 0x00ff00fful);
-+ l = (l & 0x0000fffful) + ((l >> 16) & 0x0000fffful);
-+# endif
-+
-+ s += l;
-+#endif
-+ }
-+
-+ return s;
-+}
-diff --git a/libc/sysdeps/linux/common/sched_cpufree.c b/libc/sysdeps/linux/common/sched_cpufree.c
-new file mode 100644
-index 0000000..dd4c613
---- /dev/null
-+++ b/libc/sysdeps/linux/common/sched_cpufree.c
-@@ -0,0 +1,27 @@
-+/* Copyright (C) 2007 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, write to the Free
-+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+ 02111-1307 USA. */
-+
-+#include <sched.h>
-+#include <stdlib.h>
-+
-+
-+void
-+__sched_cpufree (cpu_set_t *set)
-+{
-+ free (set);
-+}
-diff --git a/libc/sysdeps/linux/common/sched_getcpu.c b/libc/sysdeps/linux/common/sched_getcpu.c
-new file mode 100644
-index 0000000..b193d65
---- /dev/null
-+++ b/libc/sysdeps/linux/common/sched_getcpu.c
-@@ -0,0 +1,37 @@
-+/* Copyright (C) 2007 Free Software Foundation, Inc.
-+ This file is part of the GNU C Library.
-+
-+ The GNU C Library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Lesser General Public
-+ License as published by the Free Software Foundation; either
-+ version 2.1 of the License, or (at your option) any later version.
-+
-+ The GNU C Library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Lesser General Public License for more details.
-+
-+ You should have received a copy of the GNU Lesser General Public
-+ License along with the GNU C Library; if not, write to the Free
-+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+ 02111-1307 USA. */
-+
-+#include <stdlib.h>
-+#include <errno.h>
-+#include <sched.h>
-+#include <sysdep.h>
-+
-+
-+int
-+sched_getcpu (void)
-+{
-+#ifdef __NR_getcpu
-+ unsigned int cpu;
-+ int r = INLINE_SYSCALL (getcpu, 3, &cpu, NULL, NULL);
-+
-+ return r == -1 ? r : cpu;
-+#else
-+ __set_errno (ENOSYS);
-+ return -1;
-+#endif
-+}
-diff --git a/libc/sysdeps/linux/common/unshare.c b/libc/sysdeps/linux/common/unshare.c
-new file mode 100644
-index 0000000..485bf88
---- /dev/null
-+++ b/libc/sysdeps/linux/common/unshare.c
-@@ -0,0 +1,12 @@
-+/* vi: set sw=4 ts=4: */
-+/*
-+ * unshare() for uClibc
-+ *
-+ * Copyright (C) 2011 Henning Heinold <heinold@inf.fu-berlin.de>
-+ *
-+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-+ */
-+
-+#include <sys/syscall.h>
-+#include <sched.h>
-+_syscall1(int, unshare, int, flags)
---
-1.7.5.3
-
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.33/0001-Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS-so.patch b/meta/recipes-core/uclibc/uclibc-0.9.33/0001-Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS-so.patch
new file mode 100644
index 0000000..2f0c191
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.33/0001-Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS-so.patch
@@ -0,0 +1,32 @@
+From 6c3919a6d4a8686772e2a302bf951548ee24a8c1 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 3 Feb 2012 10:57:44 -0800
+Subject: [PATCH] Declare __err and pass it to INTERNAL_SYSCALL_NCS so
+ subsequent macros can use it
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libc/sysdeps/linux/common/bits/syscalls-common.h | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+
+Upstream-Status: Pending
+
+diff --git a/libc/sysdeps/linux/common/bits/syscalls-common.h b/libc/sysdeps/linux/common/bits/syscalls-common.h
+index faebd1b..0f5a929 100644
+--- a/libc/sysdeps/linux/common/bits/syscalls-common.h
++++ b/libc/sysdeps/linux/common/bits/syscalls-common.h
+@@ -59,8 +59,8 @@
+ #ifndef INLINE_SYSCALL_NOERR_NCS
+ # define INLINE_SYSCALL_NOERR_NCS(name, nr, args...) \
+ ({ \
+- /*INTERNAL_SYSCALL_DECL(__err);*/ \
+- long __res = INTERNAL_SYSCALL_NCS(name, /*__err*/, nr, args); \
++ INTERNAL_SYSCALL_DECL(__err); \
++ long __res = INTERNAL_SYSCALL_NCS(name, __err, nr, args); \
+ __res; \
+ })
+ #endif
+--
+1.7.5.4
+
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.33/0001-lstat-stat-fstat-Use-64bit-version-of-syscall-if-ava.patch b/meta/recipes-core/uclibc/uclibc-0.9.33/0001-lstat-stat-fstat-Use-64bit-version-of-syscall-if-ava.patch
new file mode 100644
index 0000000..da4ffef
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.33/0001-lstat-stat-fstat-Use-64bit-version-of-syscall-if-ava.patch
@@ -0,0 +1,177 @@
+From effbfd8e8a7b883671b24fc9759b135b48dbfaca Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Fri, 3 Feb 2012 20:06:55 -0800
+Subject: [PATCH] lstat/stat/fstat: Use 64bit version of syscall if available
+
+This is needed for stat'ing loop devices > 255
+since otherwise kernel returns EOVERFLOW becasue
+it needs st_rdev/st_dev to be larger than 16bits but
+in kernel it uses __old_kernel_stat for stat
+syscall which has st_rdev/st_dev as unsigned short
+
+Add a testcase
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libc/sysdeps/linux/common/fstat.c | 18 ++++++++++++++----
+ libc/sysdeps/linux/common/lstat.c | 19 ++++++++++++++-----
+ libc/sysdeps/linux/common/stat.c | 18 ++++++++++++++----
+ test/stat/stat-loop256.c | 32 ++++++++++++++++++++++++++++++++
+ 4 files changed, 74 insertions(+), 13 deletions(-)
+ create mode 100644 test/stat/stat-loop256.c
+
+diff --git a/libc/sysdeps/linux/common/fstat.c b/libc/sysdeps/linux/common/fstat.c
+index acc639b..4726a68 100644
+--- a/libc/sysdeps/linux/common/fstat.c
++++ b/libc/sysdeps/linux/common/fstat.c
+@@ -12,18 +12,28 @@
+ #include <sys/stat.h>
+ #include "xstatconv.h"
+
+-#define __NR___syscall_fstat __NR_fstat
+-static __inline__ _syscall2(int, __syscall_fstat, int, fd, struct kernel_stat *, buf)
+-
+ int fstat(int fd, struct stat *buf)
+ {
+ int result;
++#ifdef __NR_fstat64
++ /* normal stat call has limited values for various stat elements
++ * e.g. uid device major/minor etc.
++ * so we use 64 variant if available
++ * in order to get newer versions of stat elements
++ */
++ struct kernel_stat64 kbuf;
++ result = INLINE_SYSCALL(fstat64, 2, fd, &kbuf);
++ if (result == 0) {
++ __xstat32_conv(&kbuf, buf);
++ }
++#else
+ struct kernel_stat kbuf;
+
+- result = __syscall_fstat(fd, &kbuf);
++ result = INLINE_SYSCALL(fstat, 2, fd, &kbuf);
+ if (result == 0) {
+ __xstat_conv(&kbuf, buf);
+ }
++#endif
+ return result;
+ }
+ libc_hidden_def(fstat)
+diff --git a/libc/sysdeps/linux/common/lstat.c b/libc/sysdeps/linux/common/lstat.c
+index aa77447..db72d1f 100644
+--- a/libc/sysdeps/linux/common/lstat.c
++++ b/libc/sysdeps/linux/common/lstat.c
+@@ -12,19 +12,28 @@
+ #include <sys/stat.h>
+ #include "xstatconv.h"
+
+-#define __NR___syscall_lstat __NR_lstat
+-static __inline__ _syscall2(int, __syscall_lstat,
+- const char *, file_name, struct kernel_stat *, buf)
+-
+ int lstat(const char *file_name, struct stat *buf)
+ {
+ int result;
++#ifdef __NR_lstat64
++ /* normal stat call has limited values for various stat elements
++ * e.g. uid device major/minor etc.
++ * so we use 64 variant if available
++ * in order to get newer versions of stat elements
++ */
++ struct kernel_stat64 kbuf;
++ result = INLINE_SYSCALL(lstat64, 2, file_name, &kbuf);
++ if (result == 0) {
++ __xstat32_conv(&kbuf, buf);
++ }
++#else
+ struct kernel_stat kbuf;
+
+- result = __syscall_lstat(file_name, &kbuf);
++ result = INLINE_SYSCALL(lstat, 2, file_name, &kbuf);
+ if (result == 0) {
+ __xstat_conv(&kbuf, buf);
+ }
++#endif
+ return result;
+ }
+ libc_hidden_def(lstat)
+diff --git a/libc/sysdeps/linux/common/stat.c b/libc/sysdeps/linux/common/stat.c
+index a6ab291..829f35a 100644
+--- a/libc/sysdeps/linux/common/stat.c
++++ b/libc/sysdeps/linux/common/stat.c
+@@ -12,20 +12,30 @@
+ #include <sys/stat.h>
+ #include "xstatconv.h"
+
+-#define __NR___syscall_stat __NR_stat
+ #undef stat
+-static __inline__ _syscall2(int, __syscall_stat,
+- const char *, file_name, struct kernel_stat *, buf)
+
+ int stat(const char *file_name, struct stat *buf)
+ {
+ int result;
++#ifdef __NR_stat64
++ /* normal stat call has limited values for various stat elements
++ * e.g. uid device major/minor etc.
++ * so we use 64 variant if available
++ * in order to get newer versions of stat elements
++ */
++ struct kernel_stat64 kbuf;
++ result = INLINE_SYSCALL(stat64, 2, file_name, &kbuf);
++ if (result == 0) {
++ __xstat32_conv(&kbuf, buf);
++ }
++#else
+ struct kernel_stat kbuf;
+
+- result = __syscall_stat(file_name, &kbuf);
++ result = INLINE_SYSCALL(stat, 2, file_name, &kbuf);
+ if (result == 0) {
+ __xstat_conv(&kbuf, buf);
+ }
++#endif
+ return result;
+ }
+ libc_hidden_def(stat)
+diff --git a/test/stat/stat-loop256.c b/test/stat/stat-loop256.c
+new file mode 100644
+index 0000000..14284c1
+--- /dev/null
++++ b/test/stat/stat-loop256.c
+@@ -0,0 +1,32 @@
++#include <stdio.h>
++#include <unistd.h>
++#include <stdlib.h>
++#include <sys/stat.h>
++int main()
++{
++ struct stat statbuf;
++ int ret = 0;
++ char* loop255 = "/dev/loop255";
++ char* loop256 = "/dev/loop256";
++ mode_t mode = 0660;
++ mknod(loop255, mode, 0x7ff);
++ mknod(loop256, mode, 0x100700);
++ ret = stat(loop255, &statbuf);
++ if(ret < 0) {
++ printf("stat: Cant stat %s\n",loop255);
++ unlink(loop255);
++ exit(1);
++ }
++ ret = stat(loop256, &statbuf);
++ if(ret < 0) {
++ printf("stat: Cant stat %s\n",loop256);
++ unlink(loop255);
++ unlink(loop256);
++ exit(1);
++ }
++
++ unlink(loop255);
++ unlink(loop256);
++ exit(0);
++}
++
+--
+1.7.5.4
+
--git a/meta/recipes-core/uclibc/uclibc-0.9.32/argp-headers.patch b/meta/recipes-core/uclibc/uclibc-0.9.33/argp-headers.patch
similarity index 99%
rename from meta/recipes-core/uclibc/uclibc-0.9.32/argp-headers.patch
rename to meta/recipes-core/uclibc/uclibc-0.9.33/argp-headers.patch
index 7fd148f..b31b991 100644
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/argp-headers.patch
+++ b/meta/recipes-core/uclibc/uclibc-0.9.33/argp-headers.patch
@@ -8,6 +8,8 @@ Signed-off-by: Salvatore Cro <salvatore.cro at st.com>
create mode 100644 include/argp.h
create mode 100644 libc/argp/argp-fmtstream.h
+Upstream-Status: Pending
+
Index: git/include/argp.h
===================================================================
--- /dev/null
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/argp-support.patch b/meta/recipes-core/uclibc/uclibc-0.9.33/argp-support.patch
similarity index 99%
rename from meta/recipes-core/uclibc/uclibc-0.9.32/argp-support.patch
rename to meta/recipes-core/uclibc/uclibc-0.9.33/argp-support.patch
index 04a3c78..3e9680f 100644
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/argp-support.patch
+++ b/meta/recipes-core/uclibc/uclibc-0.9.33/argp-support.patch
@@ -13,6 +13,9 @@ it doesn't need to link libuargp.so explicitely.
Signed-off-by: Salvatore Cro <salvatore.cro at st.com>
Signed-off-by: Filippo Arcidiacono <filippo.arcidiacono at st.com>
Signed-off-by: Carmelo Amoroso <carmelo.amoroso at st.com>
+
+Upstream-Status: Pending
+
---
Makefile.in | 8 +
Makerules | 8 +-
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/compile-arm-fork-with-O2.patch b/meta/recipes-core/uclibc/uclibc-0.9.33/compile-arm-fork-with-O2.patch
similarity index 97%
rename from meta/recipes-core/uclibc/uclibc-0.9.32/compile-arm-fork-with-O2.patch
rename to meta/recipes-core/uclibc/uclibc-0.9.33/compile-arm-fork-with-O2.patch
index 429f27d..15ee0ca 100644
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/compile-arm-fork-with-O2.patch
+++ b/meta/recipes-core/uclibc/uclibc-0.9.33/compile-arm-fork-with-O2.patch
@@ -1,5 +1,5 @@
When compiling in thumb mode for arm with -Os gcc gives up since it can not find registers
-to spill. So we use -O2 option for compiling fork.c It may be addressable is gcc.
+to spill. So we use -O2 option for compiling fork.c It may be addressable in gcc.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.33/define-MSG_CMSG_CLOEXEC.patch b/meta/recipes-core/uclibc/uclibc-0.9.33/define-MSG_CMSG_CLOEXEC.patch
new file mode 100644
index 0000000..4e900f3
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.33/define-MSG_CMSG_CLOEXEC.patch
@@ -0,0 +1,25 @@
+Add definition of MSG_WAITFORONE and MSG_CMSG_CLOEXEC
+
+Upstream-Status: Pending
+
+Index: git/libc/sysdeps/linux/common/bits/socket.h
+===================================================================
+--- git.orig/libc/sysdeps/linux/common/bits/socket.h 2012-01-26 23:23:21.537456132 -0800
++++ git/libc/sysdeps/linux/common/bits/socket.h 2012-01-26 23:25:10.125461388 -0800
+@@ -235,8 +235,15 @@
+ #define MSG_ERRQUEUE MSG_ERRQUEUE
+ MSG_NOSIGNAL = 0x4000, /* Do not generate SIGPIPE. */
+ #define MSG_NOSIGNAL MSG_NOSIGNAL
+- MSG_MORE = 0x8000 /* Sender will send more. */
++ MSG_MORE = 0x8000, /* Sender will send more. */
+ #define MSG_MORE MSG_MORE
++ MSG_WAITFORONE = 0x10000, /* Wait for at least one packet to return.*/
++#define MSG_WAITFORONE MSG_WAITFORONE
++
++ MSG_CMSG_CLOEXEC = 0x40000000 /* Set close_on_exit for file
++ descriptor received through
++ SCM_RIGHTS. */
++#define MSG_CMSG_CLOEXEC MSG_CMSG_CLOEXEC
+ };
+
+
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.33/dup3.patch b/meta/recipes-core/uclibc/uclibc-0.9.33/dup3.patch
new file mode 100644
index 0000000..481f23b
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.33/dup3.patch
@@ -0,0 +1,37 @@
+Implement dup3()
+
+Upstream-Status: Pending
+
+Index: git/libc/sysdeps/linux/common/dup3.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ git/libc/sysdeps/linux/common/dup3.c 2012-01-27 07:40:52.802900849 -0800
+@@ -0,0 +1,15 @@
++/* vi: set sw=4 ts=4: */
++/*
++ * dup3() for uClibc
++ *
++ * Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
++ *
++ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
++ */
++
++#include <sys/syscall.h>
++#include <unistd.h>
++
++
++_syscall3(int, dup3, int, oldfd, int, newfd, int, flags)
++libc_hidden_def(dup3)
+Index: git/include/unistd.h
+===================================================================
+--- git.orig/include/unistd.h 2012-01-27 01:19:17.521792781 -0800
++++ git/include/unistd.h 2012-01-27 07:40:03.106898447 -0800
+@@ -512,6 +512,8 @@
+ /* Duplicate FD to FD2, closing FD2 and making it open on the same file. */
+ extern int dup2 (int __fd, int __fd2) __THROW;
+ libc_hidden_proto(dup2)
++extern int dup3 (int __fd, int __fd2, int __flags) __THROW;
++libc_hidden_proto(dup3)
+
+ /* NULL-terminated array of "NAME=VALUE" environment variables. */
+ extern char **__environ;
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch b/meta/recipes-core/uclibc/uclibc-0.9.33/ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch
similarity index 86%
rename from meta/recipes-core/uclibc/uclibc-0.9.32/ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch
rename to meta/recipes-core/uclibc/uclibc-0.9.33/ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch
index cfa68ce..d44acca 100644
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch
+++ b/meta/recipes-core/uclibc/uclibc-0.9.33/ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch
@@ -1,3 +1,9 @@
+resolver code should always be in arm mode
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+
Index: uClibc/ldso/ldso/arm/resolve.S
===================================================================
--- uClibc.orig/ldso/ldso/arm/resolve.S 2009-03-20 12:03:32.000000000 -0700
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.33/libc_symbols_include_bits_uclibc_config.patch b/meta/recipes-core/uclibc/uclibc-0.9.33/libc_symbols_include_bits_uclibc_config.patch
new file mode 100644
index 0000000..8064115
--- /dev/null
+++ b/meta/recipes-core/uclibc/uclibc-0.9.33/libc_symbols_include_bits_uclibc_config.patch
@@ -0,0 +1,19 @@
+Index: git/include/libc-symbols.h
+===================================================================
+--- git.orig/include/libc-symbols.h 2011-07-05 17:04:41.171219323 -0700
++++ git/include/libc-symbols.h 2011-07-05 22:50:36.851661478 -0700
+@@ -48,10 +48,12 @@
+
+ */
+
+-#include <bits/uClibc_arch_features.h>
+-
+ /* Enable declarations of GNU extensions, since we are compiling them. */
+ #define _GNU_SOURCE 1
++#define __need_uClibc_config_h
++#include <bits/uClibc_config.h>
++#undef __need_uClibc_config_h
++#include <bits/uClibc_arch_features.h>
+
+ /* Prepare for the case that `__builtin_expect' is not available. */
+ #if defined __GNUC__ && __GNUC__ == 2 && __GNUC_MINOR__ < 96
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/mips/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.33/mips/uClibc.machine
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-0.9.32/mips/uClibc.machine
rename to meta/recipes-core/uclibc/uclibc-0.9.33/mips/uClibc.machine
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/orign_path.patch b/meta/recipes-core/uclibc/uclibc-0.9.33/orign_path.patch
similarity index 64%
rename from meta/recipes-core/uclibc/uclibc-0.9.32/orign_path.patch
rename to meta/recipes-core/uclibc/uclibc-0.9.33/orign_path.patch
index 631951e..c9c15a3 100644
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/orign_path.patch
+++ b/meta/recipes-core/uclibc/uclibc-0.9.33/orign_path.patch
@@ -3,16 +3,16 @@ http://lists.busybox.net/pipermail/uclibc/2011-March/045003.html
Upstream-Status: Pending
-diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c
-index 505247e..2b2d429 100644
---- a/ldso/ldso/dl-elf.c
-+++ b/ldso/ldso/dl-elf.c
-@@ -133,53 +133,60 @@ _dl_protect_relro (struct elf_resolve *l)
+Index: git/ldso/ldso/dl-elf.c
+===================================================================
+--- git.orig/ldso/ldso/dl-elf.c 2012-01-23 19:18:58.000000000 -0800
++++ git/ldso/ldso/dl-elf.c 2012-01-23 21:52:06.144646590 -0800
+@@ -133,53 +133,60 @@
* in uClibc/ldso/util/ldd.c */
static struct elf_resolve *
- search_for_named_library(const char *name, int secure, const char *path_list,
+ search_for_named_library(const char *name, unsigned rflags, const char *path_list,
- struct dyn_elf **rpnt)
-+ struct dyn_elf **rpnt, const char *origin)
++ struct dyn_elf **rpnt, const char* origin)
{
- char *path, *path_n, *mylibname;
+ char *mylibname;
@@ -47,18 +47,6 @@ index 505247e..2b2d429 100644
- if (*path == 0) {
- *path = ':';
- done = 1;
-- }
-- if (*path == ':') {
-- *path = 0;
-- if (*path_n)
-- _dl_strcpy(mylibname, path_n);
-- else
-- _dl_strcpy(mylibname, "."); /* Assume current dir if empty path */
-- _dl_strcat(mylibname, "/");
-- _dl_strcat(mylibname, name);
-- if ((tpnt = _dl_load_elf_shared_library(secure, rpnt, mylibname)) != NULL)
-- return tpnt;
-- path_n = path+1;
+ for (p = path_list; p != NULL; p = pn) {
+ pn = _dl_strchr(p + 1, ':');
+ if (pn != NULL) {
@@ -69,7 +57,7 @@ index 505247e..2b2d429 100644
+
+ if (plen >= 7 && _dl_memcmp(p, "$ORIGIN", 7) == 0) {
+ int olen;
-+ if (secure && plen != 7)
++ if (rflags && plen != 7)
+ continue;
+ if (origin == NULL)
+ continue;
@@ -86,12 +74,24 @@ index 505247e..2b2d429 100644
+ } else {
+ _dl_strcpy(mylibname, ".");
}
+- if (*path == ':') {
+- *path = 0;
+- if (*path_n)
+- _dl_strcpy(mylibname, path_n);
+- else
+- _dl_strcpy(mylibname, "."); /* Assume current dir if empty path */
+- _dl_strcat(mylibname, "/");
+- _dl_strcat(mylibname, name);
+- if ((tpnt = _dl_load_elf_shared_library(rflags, rpnt, mylibname)) != NULL)
+- return tpnt;
+- path_n = path+1;
+- }
- path++;
- } while (!done);
+ _dl_strcat(mylibname, "/");
+ _dl_strcat(mylibname, name);
+
-+ tpnt = _dl_load_elf_shared_library(secure, rpnt, mylibname);
++ tpnt = _dl_load_elf_shared_library(rflags, rpnt, mylibname);
+ if (tpnt != NULL)
+ return tpnt;
+ }
@@ -99,44 +99,46 @@ index 505247e..2b2d429 100644
return NULL;
}
-@@ -231,7 +238,8 @@ struct elf_resolve *_dl_load_shared_library(int secure, struct dyn_elf **rpnt,
+@@ -231,8 +238,10 @@
if (pnt) {
pnt += (unsigned long) tpnt->dynamic_info[DT_STRTAB];
_dl_if_debug_dprint("\tsearching RPATH='%s'\n", pnt);
-- if ((tpnt1 = search_for_named_library(libname, secure, pnt, rpnt)) != NULL)
-+ if ((tpnt1 = search_for_named_library(libname, secure, pnt, rpnt,
+- if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt)) != NULL)
++ if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt,
+ tpnt->libname)) != NULL)
return tpnt1;
++
}
#endif
-@@ -239,7 +247,7 @@ struct elf_resolve *_dl_load_shared_library(int secure, struct dyn_elf **rpnt,
+
+@@ -240,7 +249,7 @@
/* Check in LD_{ELF_}LIBRARY_PATH, if specified and allowed */
if (_dl_library_path) {
_dl_if_debug_dprint("\tsearching LD_LIBRARY_PATH='%s'\n", _dl_library_path);
-- if ((tpnt1 = search_for_named_library(libname, secure, _dl_library_path, rpnt)) != NULL)
-+ if ((tpnt1 = search_for_named_library(libname, secure, _dl_library_path, rpnt, NULL)) != NULL)
+- if ((tpnt1 = search_for_named_library(libname, rflags, _dl_library_path, rpnt)) != NULL)
++ if ((tpnt1 = search_for_named_library(libname, rflags, _dl_library_path, rpnt, NULL)) != NULL)
{
return tpnt1;
}
-@@ -253,7 +261,7 @@ struct elf_resolve *_dl_load_shared_library(int secure, struct dyn_elf **rpnt,
+@@ -254,7 +263,7 @@
if (pnt) {
pnt += (unsigned long) tpnt->dynamic_info[DT_STRTAB];
_dl_if_debug_dprint("\tsearching RUNPATH='%s'\n", pnt);
-- if ((tpnt1 = search_for_named_library(libname, secure, pnt, rpnt)) != NULL)
-+ if ((tpnt1 = search_for_named_library(libname, secure, pnt, rpnt, NULL)) != NULL)
+- if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt)) != NULL)
++ if ((tpnt1 = search_for_named_library(libname, rflags, pnt, rpnt, NULL)) != NULL)
return tpnt1;
}
#endif
-@@ -287,7 +295,7 @@ struct elf_resolve *_dl_load_shared_library(int secure, struct dyn_elf **rpnt,
+@@ -288,7 +297,7 @@
/* Look for libraries wherever the shared library loader
* was installed */
_dl_if_debug_dprint("\tsearching ldso dir='%s'\n", _dl_ldsopath);
-- tpnt1 = search_for_named_library(libname, secure, _dl_ldsopath, rpnt);
-+ tpnt1 = search_for_named_library(libname, secure, _dl_ldsopath, rpnt, NULL);
+- tpnt1 = search_for_named_library(libname, rflags, _dl_ldsopath, rpnt);
++ tpnt1 = search_for_named_library(libname, rflags, _dl_ldsopath, rpnt, NULL);
if (tpnt1 != NULL)
return tpnt1;
-
-@@ -300,7 +308,7 @@ struct elf_resolve *_dl_load_shared_library(int secure, struct dyn_elf **rpnt,
+ #endif
+@@ -301,7 +310,7 @@
#ifndef __LDSO_CACHE_SUPPORT__
":" UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib"
#endif
@@ -145,12 +147,12 @@ index 505247e..2b2d429 100644
if (tpnt1 != NULL)
return tpnt1;
-diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c
-index 7ee9257..9423670 100644
---- a/ldso/ldso/ldso.c
-+++ b/ldso/ldso/ldso.c
-@@ -272,6 +272,20 @@ static void __attribute__ ((destructor)) __attribute_used__ _dl_fini(void)
- }
+Index: git/ldso/ldso/ldso.c
+===================================================================
+--- git.orig/ldso/ldso/ldso.c 2012-01-23 19:18:58.000000000 -0800
++++ git/ldso/ldso/ldso.c 2012-01-23 21:34:11.152594621 -0800
+@@ -407,6 +407,20 @@
+ return p - list;
}
+static void _dl_setup_progname(const char *argv0)
@@ -167,10 +169,10 @@ index 7ee9257..9423670 100644
+ }
+}
+
- void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
- ElfW(auxv_t) auxvt[AT_EGID + 1], char **envp,
- char **argv
-@@ -321,9 +335,7 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
+ void *_dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr,
+ ElfW(auxv_t) auxvt[AT_EGID + 1], char **envp, char **argv
+ DL_GET_READY_TO_RUN_EXTRA_PARMS)
+@@ -458,9 +472,7 @@
* been fixed up by now. Still no function calls outside of this
* library, since the dynamic resolver is not yet ready.
*/
@@ -179,5 +181,5 @@ index 7ee9257..9423670 100644
- }
+ _dl_setup_progname(argv[0]);
+ #ifndef __LDSO_STANDALONE_SUPPORT__
if (_start == (void *) auxvt[AT_ENTRY].a_un.a_val) {
- _dl_dprintf(_dl_debug_file, "Standalone execution is not supported yet\n");
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/powerpc_copysignl.patch b/meta/recipes-core/uclibc/uclibc-0.9.33/powerpc_copysignl.patch
similarity index 96%
rename from meta/recipes-core/uclibc/uclibc-0.9.32/powerpc_copysignl.patch
rename to meta/recipes-core/uclibc/uclibc-0.9.33/powerpc_copysignl.patch
index 339ce7f..3fa10af 100644
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/powerpc_copysignl.patch
+++ b/meta/recipes-core/uclibc/uclibc-0.9.33/powerpc_copysignl.patch
@@ -1,3 +1,9 @@
+Add ppc copysignl implementation
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
Index: git/libc/sysdeps/linux/powerpc/Makefile.arch
===================================================================
--- git.orig/libc/sysdeps/linux/powerpc/Makefile.arch
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/remove_attribute_optimize_Os.patch b/meta/recipes-core/uclibc/uclibc-0.9.33/remove_attribute_optimize_Os.patch
similarity index 93%
rename from meta/recipes-core/uclibc/uclibc-0.9.32/remove_attribute_optimize_Os.patch
rename to meta/recipes-core/uclibc/uclibc-0.9.33/remove_attribute_optimize_Os.patch
index 1930383..bee251c 100644
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/remove_attribute_optimize_Os.patch
+++ b/meta/recipes-core/uclibc/uclibc-0.9.33/remove_attribute_optimize_Os.patch
@@ -1,15 +1,8 @@
-Index: git/include/features.h
-===================================================================
---- git.orig/include/features.h
-+++ git/include/features.h
-@@ -186,7 +186,6 @@
- # define __need_uClibc_config_h
- # include <bits/uClibc_config.h>
- # undef __need_uClibc_config_h
--
- /* For uClibc, always optimize for size -- this should disable
- * a lot of expensive inlining...
- * TODO: this is wrong! __OPTIMIZE_SIZE__ is an indicator of
+Dont support localised optimizations this helps to have a global -O level
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Pending
+
Index: git/libpthread/nptl/pthread_mutex_timedlock.c
===================================================================
--- git.orig/libpthread/nptl/pthread_mutex_timedlock.c
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/uClibc.distro b/meta/recipes-core/uclibc/uclibc-0.9.33/uClibc.distro
similarity index 96%
rename from meta/recipes-core/uclibc/uclibc-0.9.32/uClibc.distro
rename to meta/recipes-core/uclibc/uclibc-0.9.33/uClibc.distro
index 5638d47..c33bf8e 100644
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/uClibc.distro
+++ b/meta/recipes-core/uclibc/uclibc-0.9.33/uClibc.distro
@@ -181,4 +181,10 @@ UCLIBC_HAS_FLOATS=y
# needed by systemd
UCLIBC_HAS_UTMPX=y
-
+UCLIBC_LINUX_MODULE_26=y
+UCLIBC_HAS_RESOLVER_SUPPORT=y
+# needed for LTP
+UCLIBC_SUSV4_LEGACY=y
+UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=y
+DO_XSI_MATH=y
+UCLIBC_SV4_DEPRECATED=y
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/uClibc.machine b/meta/recipes-core/uclibc/uclibc-0.9.33/uClibc.machine
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-0.9.32/uClibc.machine
rename to meta/recipes-core/uclibc/uclibc-0.9.33/uClibc.machine
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/uclibc-execvpe.patch b/meta/recipes-core/uclibc/uclibc-0.9.33/uclibc-execvpe.patch
similarity index 99%
rename from meta/recipes-core/uclibc/uclibc-0.9.32/uclibc-execvpe.patch
rename to meta/recipes-core/uclibc/uclibc-0.9.33/uclibc-execvpe.patch
index cd90a09..fe191fc 100644
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/uclibc-execvpe.patch
+++ b/meta/recipes-core/uclibc/uclibc-0.9.33/uclibc-execvpe.patch
@@ -12,6 +12,9 @@ Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>
3 files changed, 46 insertions(+), 5 deletions(-)
create mode 100644 libc/unistd/execvpe.c
+
+Upstream-Status: Pending
+
diff --git a/include/unistd.h b/include/unistd.h
index 9568790..070e4f2 100644
--- a/include/unistd.h
diff --git a/meta/recipes-core/uclibc/uclibc-0.9.32/uclibc_enable_log2_test.patch b/meta/recipes-core/uclibc/uclibc-0.9.33/uclibc_enable_log2_test.patch
similarity index 81%
rename from meta/recipes-core/uclibc/uclibc-0.9.32/uclibc_enable_log2_test.patch
rename to meta/recipes-core/uclibc/uclibc-0.9.33/uclibc_enable_log2_test.patch
index f8f3a7d..37a5988 100644
--- a/meta/recipes-core/uclibc/uclibc-0.9.32/uclibc_enable_log2_test.patch
+++ b/meta/recipes-core/uclibc/uclibc-0.9.33/uclibc_enable_log2_test.patch
@@ -1,3 +1,8 @@
+uclibc now has log2 so enable the tests
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Pending
+
Index: uClibc/test/math/libm-test.inc
===================================================================
--- uClibc/test/math/libm-test.inc (revision 23784)
diff --git a/meta/recipes-core/uclibc/uclibc-initial_0.9.32.bb b/meta/recipes-core/uclibc/uclibc-initial_0.9.33.bb
similarity index 100%
rename from meta/recipes-core/uclibc/uclibc-initial_0.9.32.bb
rename to meta/recipes-core/uclibc/uclibc-initial_0.9.33.bb
diff --git a/meta/recipes-core/uclibc/uclibc_0.9.32.bb b/meta/recipes-core/uclibc/uclibc_0.9.33.bb
similarity index 45%
rename from meta/recipes-core/uclibc/uclibc_0.9.32.bb
rename to meta/recipes-core/uclibc/uclibc_0.9.33.bb
index 235b436..b559fd4 100644
--- a/meta/recipes-core/uclibc/uclibc_0.9.32.bb
+++ b/meta/recipes-core/uclibc/uclibc_0.9.33.bb
@@ -1,34 +1,26 @@
-SRCREV="9152c4d67c763fde5712e2d181d92c0d7e1e2ab9"
+SRCREV="1548ee3ca582f3732136e71613c87c16230f71cc"
require uclibc.inc
-PR = "${INC_PR}.3"
+
+PR = "${INC_PR}.0"
PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
SRC_URI = "git://uclibc.org/uClibc.git;branch=${PV};protocol=git \
file://uClibc.machine \
file://uClibc.distro \
- file://uclibc-arm-ftruncate64.patch \
file://uclibc_enable_log2_test.patch \
file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch \
- file://select-force-thumb.patch \
- file://remove-sub-arch-variants.patch \
- file://transform-eabi-oabi-choice.patch \
- file://include-arm-asm.h.patch \
- file://detect-bx-availibility.patch \
- file://remove-eabi-oabi-selection.patch \
file://powerpc_copysignl.patch \
file://argp-support.patch \
file://argp-headers.patch \
file://remove_attribute_optimize_Os.patch \
file://compile-arm-fork-with-O2.patch \
- file://epoll-asm-fix.patch \
- file://orign_path.patch \
- file://rtld_no.patch \
- file://0001-Config.in.arch-Free-UCLIBC_HAS_FPU-setting-from-depe.patch \
- file://0001-mips-signalfd.h-SFD_NONBLOCK-for-mips-is-0200-unlike.patch \
file://uclibc-execvpe.patch \
- file://uclibc_scheduler_update.patch \
- file://sync_file_range2.patch \
- file://mount.h-update.patch \
+ file://orign_path.patch \
+ file://dup3.patch \
+ file://define-MSG_CMSG_CLOEXEC.patch \
+ file://0001-lstat-stat-fstat-Use-64bit-version-of-syscall-if-ava.patch \
+ file://0001-Declare-__err-and-pass-it-to-INTERNAL_SYSCALL_NCS-so.patch \
"
+
S = "${WORKDIR}/git"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 32/35] classes, recipes: Replace POKY_* with CORE_IMAGE_*
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (30 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 31/35] uclibc: Upgrade recipes from 0.9.32 -> 0.9.33 Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 33/35] gcc-cross-testing: Fix evaluation of user and target name Saul Wold
` (3 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/classes/core-image.bbclass | 8 ++++----
meta/recipes-core/images/core-image-minimal.bb | 2 +-
meta/recipes-core/images/self-hosted-image.bb | 2 +-
meta/recipes-extended/images/core-image-basic.bb | 2 +-
meta/recipes-extended/images/core-image-lsb-dev.bb | 2 +-
meta/recipes-extended/images/core-image-lsb-sdk.bb | 2 +-
meta/recipes-extended/images/core-image-lsb.bb | 2 +-
meta/recipes-graphics/images/core-image-clutter.bb | 2 +-
.../images/core-image-gtk-directfb.bb | 2 +-
meta/recipes-qt/images/qt4e-demo-image.bb | 2 +-
10 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index c08895f..668297b 100644
--- a/meta/classes/core-image.bbclass
+++ b/meta/classes/core-image.bbclass
@@ -47,18 +47,18 @@ PACKAGE_GROUP_ssh-server-openssh = "task-core-ssh-openssh"
PACKAGE_GROUP_package-management = "${ROOTFS_PKGMANAGE}"
PACKAGE_GROUP_qt4-pkgs = "task-core-qt-demos"
-POKY_BASE_INSTALL = '\
+CORE_IMAGE_BASE_INSTALL = '\
task-core-boot \
task-base-extended \
\
${@base_contains("IMAGE_FEATURES", "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)} \
\
- ${POKY_EXTRA_INSTALL} \
+ ${CORE_IMAGE_EXTRA_INSTALL} \
'
-POKY_EXTRA_INSTALL ?= ""
+CORE_IMAGE_EXTRA_INSTALL ?= ""
-IMAGE_INSTALL ?= "${POKY_BASE_INSTALL}"
+IMAGE_INSTALL ?= "${CORE_IMAGE_BASE_INSTALL}"
X11_IMAGE_FEATURES = "x11-base apps-x11-core package-management"
ENHANCED_IMAGE_FEATURES = "${X11_IMAGE_FEATURES} apps-x11-games apps-x11-pimlico package-management"
diff --git a/meta/recipes-core/images/core-image-minimal.bb b/meta/recipes-core/images/core-image-minimal.bb
index 687f72a..7953b80 100644
--- a/meta/recipes-core/images/core-image-minimal.bb
+++ b/meta/recipes-core/images/core-image-minimal.bb
@@ -3,7 +3,7 @@
#
DESCRIPTION = "A small image just capable of allowing a device to boot."
-IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${POKY_EXTRA_INSTALL}"
+IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}"
IMAGE_LINGUAS = " "
diff --git a/meta/recipes-core/images/self-hosted-image.bb b/meta/recipes-core/images/self-hosted-image.bb
index 5029ac2..a0a7592 100644
--- a/meta/recipes-core/images/self-hosted-image.bb
+++ b/meta/recipes-core/images/self-hosted-image.bb
@@ -1,6 +1,6 @@
IMAGE_INSTALL = "task-core-boot task-core-apps-console task-core-ssh-openssh task-self-hosted"
-POKY_EXTRA_INSTALL = "\
+CORE_IMAGE_EXTRA_INSTALL = "\
task-self-hosted \
"
diff --git a/meta/recipes-extended/images/core-image-basic.bb b/meta/recipes-extended/images/core-image-basic.bb
index 5e58e60..f801346 100644
--- a/meta/recipes-extended/images/core-image-basic.bb
+++ b/meta/recipes-extended/images/core-image-basic.bb
@@ -8,6 +8,6 @@ IMAGE_INSTALL = "\
task-core-basic \
"
-# ${POKY_BASE_INSTALL}
+# ${CORE_IMAGE_BASE_INSTALL}
inherit core-image
diff --git a/meta/recipes-extended/images/core-image-lsb-dev.bb b/meta/recipes-extended/images/core-image-lsb-dev.bb
index 2d6f674..e6d7bc9 100644
--- a/meta/recipes-extended/images/core-image-lsb-dev.bb
+++ b/meta/recipes-extended/images/core-image-lsb-dev.bb
@@ -5,7 +5,7 @@ standalone SDK."
IMAGE_FEATURES += "apps-console-core dev-pkgs ssh-server-openssh"
IMAGE_INSTALL = "\
- ${POKY_BASE_INSTALL} \
+ ${CORE_IMAGE_BASE_INSTALL} \
task-core-basic \
task-core-lsb \
"
diff --git a/meta/recipes-extended/images/core-image-lsb-sdk.bb b/meta/recipes-extended/images/core-image-lsb-sdk.bb
index 105c8db..0892891 100644
--- a/meta/recipes-extended/images/core-image-lsb-sdk.bb
+++ b/meta/recipes-extended/images/core-image-lsb-sdk.bb
@@ -7,7 +7,7 @@ EXTRA_IMAGE_FEATURES = "tools-debug tools-profile tools-testapps debug-tweaks"
IMAGE_INSTALL = "\
- ${POKY_BASE_INSTALL} \
+ ${CORE_IMAGE_BASE_INSTALL} \
task-core-basic \
task-core-lsb \
"
diff --git a/meta/recipes-extended/images/core-image-lsb.bb b/meta/recipes-extended/images/core-image-lsb.bb
index f669618..b0a3a4d 100644
--- a/meta/recipes-extended/images/core-image-lsb.bb
+++ b/meta/recipes-extended/images/core-image-lsb.bb
@@ -4,7 +4,7 @@ conform to Linux Standard Base (LSB)."
IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
IMAGE_INSTALL = "\
- ${POKY_BASE_INSTALL} \
+ ${CORE_IMAGE_BASE_INSTALL} \
task-core-basic \
task-core-lsb \
"
diff --git a/meta/recipes-graphics/images/core-image-clutter.bb b/meta/recipes-graphics/images/core-image-clutter.bb
index 636238a..6c49a02 100644
--- a/meta/recipes-graphics/images/core-image-clutter.bb
+++ b/meta/recipes-graphics/images/core-image-clutter.bb
@@ -6,7 +6,7 @@ IMAGE_FEATURES += "apps-console-core ${SATO_IMAGE_FEATURES}"
LICENSE = "MIT"
IMAGE_INSTALL = "\
- ${POKY_BASE_INSTALL} \
+ ${CORE_IMAGE_BASE_INSTALL} \
task-core-clutter-core \
task-core-clutter-tests \
task-core-clutter-apps"
diff --git a/meta/recipes-graphics/images/core-image-gtk-directfb.bb b/meta/recipes-graphics/images/core-image-gtk-directfb.bb
index 87b3a86..a5fba17 100644
--- a/meta/recipes-graphics/images/core-image-gtk-directfb.bb
+++ b/meta/recipes-graphics/images/core-image-gtk-directfb.bb
@@ -15,7 +15,7 @@ RDEPENDS_${PN} += " \
inherit core-image
IMAGE_INSTALL += "\
- ${POKY_BASE_INSTALL} \
+ ${CORE_IMAGE_BASE_INSTALL} \
task-core-basic \
module-init-tools \
task-core-gtk-directfb-base \
diff --git a/meta/recipes-qt/images/qt4e-demo-image.bb b/meta/recipes-qt/images/qt4e-demo-image.bb
index 6523379..2e50bf6 100644
--- a/meta/recipes-qt/images/qt4e-demo-image.bb
+++ b/meta/recipes-qt/images/qt4e-demo-image.bb
@@ -11,7 +11,7 @@ RDEPENDS_${PN} += " \
"
IMAGE_INSTALL += "\
- ${POKY_BASE_INSTALL} \
+ ${CORE_IMAGE_BASE_INSTALL} \
module-init-tools \
task-qt4e-base \
"
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 33/35] gcc-cross-testing: Fix evaluation of user and target name
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (31 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 32/35] classes, recipes: Replace POKY_* with CORE_IMAGE_* Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 34/35] mirrors.bbclass: Add yp.org and oe.org to fallback mirrors Saul Wold
` (2 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
Dont use -q to grep we pipe to /dev/null anyway all we
care is the return status of grep
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-devtools/gcc/gcc-cross.inc | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc
index 6acf8c5..b16c57d 100644
--- a/meta/recipes-devtools/gcc/gcc-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross.inc
@@ -65,11 +65,11 @@ then
exit 1;
fi
-echo "\$target" | grep −q "@" >& /dev/null
+echo "\$target" | grep "@" >& /dev/null
if [ "x\$?" = "x0" ]
then
- user=echo \$target | cut -d '@' -f 1
- target=echo \$target | cut -d '@' -f 2
+ user=\$(echo \$target | cut -d '@' -f 1)
+ target=\$(echo \$target | cut -d '@' -f 2)
else
user=\$USER
fi
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 34/35] mirrors.bbclass: Add yp.org and oe.org to fallback mirrors
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (32 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 33/35] gcc-cross-testing: Fix evaluation of user and target name Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 35/35] dhcp: move dhcp leases files handling to postinst/postrm Saul Wold
2012-02-08 0:51 ` [CONSOLIDATED PULL 00/35] Catching up with Pulls Richard Purdie
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
This should improve the fetching errors users see
when upstream src_uri is unavailable
Signed-off-by: Khem Raj <raj.khem@gmail.com>
mirrors.bbclass: remove empty line
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/classes/mirrors.bbclass | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/meta/classes/mirrors.bbclass b/meta/classes/mirrors.bbclass
index 2146087..c08a3d7 100644
--- a/meta/classes/mirrors.bbclass
+++ b/meta/classes/mirrors.bbclass
@@ -52,5 +52,24 @@ ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://gd.tuwien.ac.at/utils/adm
ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://sunsite.ualberta.ca/pub/Mirror/lsof/ \n \
ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ ftp://the.wiretapped.net/pub/security/host-security/lsof/ \n \
http://www.apache.org/dist http://archive.apache.org/dist \n \
+cvs://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
+svn://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
+git://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
+hg://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
+bzr://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
+svk://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
+p4://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
+osc://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
+https?$://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
+ftp://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
+cvs://.*/.* http://sources.openembedded.org/ \n \
+svn://.*/.* http://sources.openembedded.org/ \n \
+git://.*/.* http://sources.openembedded.org/ \n \
+hg://.*/.* http://sources.openembedded.org/ \n \
+bzr://.*/.* http://sources.openembedded.org/ \n \
+svk://.*/.* http://sources.openembedded.org/ \n \
+p4://.*/.* http://sources.openembedded.org/ \n \
+osc://.*/.* http://sources.openembedded.org/ \n \
+https?$://.*/.* http://sources.openembedded.org/ \n \
+ftp://.*/.* http://sources.openembedded.org/ \n \
"
-
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* [CONSOLIDATED PULL 35/35] dhcp: move dhcp leases files handling to postinst/postrm
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (33 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 34/35] mirrors.bbclass: Add yp.org and oe.org to fallback mirrors Saul Wold
@ 2012-02-07 22:45 ` Saul Wold
2012-02-08 0:51 ` [CONSOLIDATED PULL 00/35] Catching up with Pulls Richard Purdie
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-07 22:45 UTC (permalink / raw)
To: openembedded-core
From: Otavio Salvador <otavio@ossystems.com.br>
Both server and client needs access to leases files so its creation
and removal are now handled by postinst/postrm scripts.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
meta/recipes-connectivity/dhcp/dhcp.inc | 25 ++++++++++++++++++++++++-
meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb | 2 +-
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc
index be256ce..f66dfba 100644
--- a/meta/recipes-connectivity/dhcp/dhcp.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp.inc
@@ -66,12 +66,35 @@ FILES_dhcp-server-config = "${sysconfdir}/default/dhcp-server ${sysconfdir}/dhcp
FILES_dhcp-relay = "${sbindir}/dhcrelay ${sysconfdir}/init.d/dhcp-relay ${sysconfdir}/default/dhcp-relay"
-FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf ${localstatedir}/lib/dhcp/"
+FILES_dhcp-client = "${base_sbindir}/dhclient ${base_sbindir}/dhclient-script ${sysconfdir}/dhcp/dhclient.conf"
RDEPENDS_dhcp-client = "bash"
FILES_dhcp-omshell = "${bindir}/omshell"
pkg_postinst_dhcp-server() {
+ mkdir -p $D/${localstatedir}/lib/dhcp
touch $D/${localstatedir}/lib/dhcp/dhcpd.leases
touch $D/${localstatedir}/lib/dhcp/dhcpd6.leases
}
+
+pkg_postinst_dhcp-client() {
+ mkdir -p $D/${localstatedir}/lib/dhcp
+}
+
+pkg_postrm_dhcp-server() {
+ rm -f $D/${localstatedir}/lib/dhcp/dhcpd.leases
+ rm -f $D/${localstatedir}/lib/dhcp/dhcpd6.leases
+
+ if ! rmdir $D/${localstatedir}/lib/dhcp 2>/dev/null; then
+ echo "Not removing ${localstatedir}/lib/dhcp as it is non-empty."
+ fi
+}
+
+pkg_postrm_dhcp-client() {
+ rm -f $D/${localstatedir}/lib/dhcp/dhclient.leases
+ rm -f $D/${localstatedir}/lib/dhcp/dhclient6.leases
+
+ if ! rmdir $D/${localstatedir}/lib/dhcp 2>/dev/null; then
+ echo "Not removing ${localstatedir}/lib/dhcp as it is non-empty."
+ fi
+}
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb b/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
index a3a560b..3b1c0e2 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.2.0.bb
@@ -1,6 +1,6 @@
require dhcp.inc
-PR = "r5"
+PR = "r7"
SRC_URI += "file://fixincludes.patch \
file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
--
1.7.6.5
^ permalink raw reply related [flat|nested] 37+ messages in thread
* Re: [CONSOLIDATED PULL 00/35] Catching up with Pulls
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
` (34 preceding siblings ...)
2012-02-07 22:45 ` [CONSOLIDATED PULL 35/35] dhcp: move dhcp leases files handling to postinst/postrm Saul Wold
@ 2012-02-08 0:51 ` Richard Purdie
35 siblings, 0 replies; 37+ messages in thread
From: Richard Purdie @ 2012-02-08 0:51 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, 2012-02-07 at 14:45 -0800, Saul Wold wrote:
> Richard et al:
>
> Updates from various folks, this include kernel, uclibc.
>
> One Major change to note is Khem's task-core-tools breakup and
> the renaming of POKY_ -> CORE_IMAGE_. This will require layers
> to pay attention and fix.
>
> Sau!
>
>
> The following changes since commit 18d9fcfc4bc4b01f73e89f3b988c9d3d543c7705:
>
> libzypp: add missing runtime dependences on gzip and gnupg (2012-02-03 17:23:28 +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
>
> Andreas Oberritter (1):
> tune-mips32.inc: Add mips32-nf and mips32el-nf
>
> Bruce Ashfield (5):
> linux-yocto: locate and use out of tree features specified on the
> SRC_URI
> linux-yocto: meta updates for sys940x and cleanup
> linux-yocto: rt compiliation fix
> kern-tools: remove explicit 'yocto' references from auto-bsp handling
> linux-yocto: fri2: use emgd-1.10
>
> Chase Maupin (1):
> u-boot inc: update inc file for newer u-boot versions
>
> Darren Hart (1):
> bootimg: Use the same OS files for each boot method
>
> Khem Raj (13):
> xorg-apps: Bump PR to accomodate meta-oe recipe deletion
> task-core-tools: Divide it into 3 recipes
> Enable options needed for ltp to compile
> runqemu-internal: qemuarm can handle 256M
> gconf,consolekit: Avoid polkit when compiling with uclibc
> python: Fix build failure of python-elementtree on x86_64
> libdrm: Fix build failure unearthed by uclibc
> libx11: Backport _XGetRequest API
> pseudo: Wrap renameat and opendir
> uclibc: Upgrade recipes from 0.9.32 -> 0.9.33
> classes,recipes: Replace POKY_* with CORE_IMAGE_*
> gcc-cross-testing: Fix evaluation of user and target name
> mirrors.bbclass: Add yp.org and oe.org to fallback mirrors
>
> Mike Crowe (3):
> libusb1: Cope with ${libdir} and ${base_libdir} being the same
> libusb-compat: Cope with ${libdir} and ${base_libdir} being the same
> libcap: Cope with ${libdir} and ${base_libdir} being the same
>
> Otavio Salvador (2):
> udev: stop providing cache support by default
> dhcp: move dhcp leases files handling to postinst/postrm
>
> Peter Tworek (3):
> busybox: Add flock utility to default configuration.
> webkit-gtk: Fix error.html resource path.
> webkit-gtk: Make webgl support configurable via DISTRO_FEATURES.
>
> Saul Wold (3):
> gnupg-1.4.7: Update Patch Info
> openssl-0.9.8: Remove in favor or 1.0.0
> mtools-3.9.9: Use correct URI for the mirror
>
> Wade Farnsworth (3):
> systemtap: bump SRCREV to grab version 1.7
> systemtap: extend the recipe to build the native package
> systemtap: build and install uprobes.ko
Merged to master, thanks.
Richard
^ permalink raw reply [flat|nested] 37+ messages in thread
end of thread, other threads:[~2012-02-08 1:00 UTC | newest]
Thread overview: 37+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-07 22:45 [CONSOLIDATED PULL 00/35] Catching up with Pulls Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 01/35] tune-mips32.inc: Add mips32-nf and mips32el-nf Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 02/35] bootimg: Use the same OS files for each boot method Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 03/35] busybox: Add flock utility to default configuration Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 04/35] gnupg-1.4.7: Update Patch Info Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 05/35] openssl-0.9.8: Remove in favor or 1.0.0 Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 06/35] webkit-gtk: Fix error.html resource path Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 07/35] webkit-gtk: Make webgl support configurable via DISTRO_FEATURES Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 08/35] libusb1: Cope with ${libdir} and ${base_libdir} being the same Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 09/35] libusb-compat: " Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 10/35] libcap: " Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 11/35] u-boot inc: update inc file for newer u-boot versions Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 12/35] systemtap: bump SRCREV to grab version 1.7 Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 13/35] systemtap: extend the recipe to build the native package Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 14/35] systemtap: build and install uprobes.ko Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 15/35] udev: stop providing cache support by default Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 16/35] xorg-apps: Bump PR to accomodate meta-oe recipe deletion Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 17/35] linux-yocto: locate and use out of tree features specified on the SRC_URI Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 18/35] linux-yocto: meta updates for sys940x and cleanup Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 19/35] linux-yocto: rt compiliation fix Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 20/35] kern-tools: remove explicit 'yocto' references from auto-bsp handling Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 21/35] linux-yocto: fri2: use emgd-1.10 Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 22/35] task-core-tools: Divide it into 3 recipes Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 23/35] Enable options needed for ltp to compile Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 24/35] runqemu-internal: qemuarm can handle 256M Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 25/35] gconf, consolekit: Avoid polkit when compiling with uclibc Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 26/35] python: Fix build failure of python-elementtree on x86_64 Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 27/35] libdrm: Fix build failure unearthed by uclibc Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 28/35] libx11: Backport _XGetRequest API Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 29/35] mtools-3.9.9: Use correct URI for the mirror Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 30/35] pseudo: Wrap renameat and opendir Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 31/35] uclibc: Upgrade recipes from 0.9.32 -> 0.9.33 Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 32/35] classes, recipes: Replace POKY_* with CORE_IMAGE_* Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 33/35] gcc-cross-testing: Fix evaluation of user and target name Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 34/35] mirrors.bbclass: Add yp.org and oe.org to fallback mirrors Saul Wold
2012-02-07 22:45 ` [CONSOLIDATED PULL 35/35] dhcp: move dhcp leases files handling to postinst/postrm Saul Wold
2012-02-08 0:51 ` [CONSOLIDATED PULL 00/35] Catching up with Pulls Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox