Fixes for building on Fedora 14
cover Fixes for building on Fedora 14
Make 3.82 in Fedora 14 fixes some bugs in the parser which happen to have been relied upon behaviour in many projects Makefiles.
With this patch series I am able to build poky-image-sdk and meta-toolchain for qemuppc on a Fedora 14 x86_64 with the default SELINUX policy enabled.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: josh/laverne
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=josh/laverne
Thanks,
Joshua Lock <[email protected]>
---
Joshua Lock (12):
eglibc: fix build of eglibc-initial for make 3.82
busybox: import upstream patch for make 3.82
procps: fix for build against make 3.82
busybox: additional fixes for Make 3.82
linux-libc-headers: fix for Make 3.82
gstreamer: fix to comply with make 3.82's stricter parser
gst-plugins: fix for make 3.82
libowl-av: fix for Make 3.82
owl-video-widget: fix Makefile for super strict make 3.82
dates: fix for Make 3.82
contacts: fix for make 3.82
web-webkit: fix for make 3.82
Paul Eggleton (2):
openssl-native: disable execstack flag to prevent problems with
SELinux
qemu: fix failure to find zlib header files during configure
meta/recipes-connectivity/openssl/openssl.inc | 6 ++- .../recipes-connectivity/openssl/openssl_0.9.8o.bb | 2 +- .../busybox/busybox-1.16.2/make-382-fix.patch | 56 ++++++++++++++++++++ meta/recipes-core/busybox/busybox_1.16.2.bb | 3 +- .../eglibc/eglibc-2.12/fix-for-make-3.82.diff | 25 +++++++++ meta/recipes-core/eglibc/eglibc_2.12.bb | 5 +- .../qemu/qemu-0.12.4/fix-configure-checks.patch | 20 +++++++ meta/recipes-devtools/qemu/qemu_0.12.4.bb | 3 +- .../procps-3.2.7/procps-3.2.8+gmake-3.82.patch | 17 ++++++ meta/recipes-extended/procps/procps_3.2.7.bb | 3 +- .../connector-msg-size-fix.patch | 4 +- .../linux-libc-headers/make-382.patch | 36 +++++++++++++ .../linux-libc-headers_2.6.34.bb | 7 ++- .../gstreamer/gst-plugins-bad_0.10.19.bb | 2 +- .../gstreamer/gst-plugins-base_0.10.29.bb | 2 +- .../gstreamer/gst-plugins-good_0.10.23.bb | 2 +- .../gstreamer/gst-plugins-ugly_0.10.15.bb | 2 +- meta/recipes-multimedia/gstreamer/gst-plugins.inc | 5 ++- .../gstreamer/gst-plugins/make-382.patch | 25 +++++++++ .../gstreamer/gstreamer-0.10.29/make-382.patch | 32 +++++++++++ .../gstreamer/gstreamer_0.10.29.bb | 7 ++- .../owl-video-widget/libowl-av/make-382.patch | 11 ++++ .../recipes-sato/owl-video-widget/libowl-av_svn.bb | 5 +- .../owl-video-widget/owl-video/make-382.patch | 15 +++++ .../recipes-sato/owl-video-widget/owl-video_svn.bb | 3 +- meta/recipes-sato/pimlico/contacts/make-382.patch | 14 +++++ meta/recipes-sato/pimlico/contacts_git.bb | 5 +- meta/recipes-sato/pimlico/dates/make-382.patch | 16 ++++++ meta/recipes-sato/pimlico/dates_git.bb | 5 +- meta/recipes-sato/web/web-webkit/make-382.patch | 15 +++++ meta/recipes-sato/web/web-webkit_svn.bb | 5 +- 31 files changed, 329 insertions(+), 29 deletions(-) create mode 100644 meta/recipes-core/busybox/busybox-1.16.2/make-382-fix.patch create mode 100644 meta/recipes-core/eglibc/eglibc-2.12/fix-for-make-3.82.diff create mode 100644 meta/recipes-devtools/qemu/qemu-0.12.4/fix-configure-checks.patch create mode 100644 meta/recipes-extended/procps/procps-3.2.7/procps-3.2.8+gmake-3.82.patch create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/make-382.patch create mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins/make-382.patch create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer-0.10.29/make-382.patch create mode 100644 meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch create mode 100644 meta/recipes-sato/owl-video-widget/owl-video/make-382.patch create mode 100644 meta/recipes-sato/pimlico/contacts/make-382.patch create mode 100644 meta/recipes-sato/pimlico/dates/make-382.patch create mode 100644 meta/recipes-sato/web/web-webkit/make-382.patch
Signature · 1 line
1.7.3.3
PATCH 2/14 qemu: fix failure to find zlib header files during configure
Corrects problems during configure of qemu-native due to the BUILD_CFLAGS not being included when attempting to compile the test program for zlib within the configure script.
--- .../qemu/qemu-0.12.4/fix-configure-checks.patch | 20 ++++++++++++++++++++ meta/recipes-devtools/qemu/qemu_0.12.4.bb | 3 ++- 2 files changed, 22 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-devtools/qemu/qemu-0.12.4/fix-configure-checks.patch
meta/recipes-devtools/qemu/qemu-0.12.4/fix-configure-checks.patch new file +20 -0
@@ -0,0 +1,20 @@ +In native builds, qemu can fail to find zlib development files in the native +sysroot and the build machine might not have zlib-dev packages installed. + +Add CFLAGS to qemu's CFLAGS which in the native case means BUILD_CFLAGS are +added and files in the sysroot can be found. + +Patch from Paul Eggleton, Comments by RP 28/11/10 + +Index: qemu-0.12.4/configure +=================================================================== +--- qemu-0.12.4.orig/configure ++++ qemu-0.12.4/configure +@@ -99,6 +99,7 @@ QEMU_CFLAGS="-Wstrict-prototypes -Wredun + QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS" + QEMU_CFLAGS="-U_FORTIFY_SOURCE $QEMU_CFLAGS" + QEMU_CFLAGS="-I. -I\$(SRC_PATH) $QEMU_CFLAGS" ++QEMU_CFLAGS="$QEMU_CFLAGS $CFLAGS" + LDFLAGS="-g $LDFLAGS" + + gcc_flags="-Wold-style-declaration -Wold-style-definition"
meta/recipes-devtools/qemu/qemu_0.12.4.bb +2 -1
@@ -1,6 +1,6 @@ require qemu.inc -PR = "r22" +PR = "r23" FILESPATH = "${FILE_DIRNAME}/qemu-${PV}" FILESDIR = "${WORKDIR}"
@@ -21,6 +21,7 @@ SRC_URI = "\ file://arm-cp15-fix.patch \ file://cursor-shadow-fix.patch \ file://vmware-vga-fifo-rewind.patch \ + file://fix-configure-checks.patch \ file://powerpc_rom.bin" do_install_append () {
Signature · 1 line
1.7.3.3
PATCH 1/14 openssl-native: disable execstack flag to prevent problems with SELinux
In reply to Joshua LockThe execstack flag gets set on libcrypto.so by default which causes SELinux to prevent it from being loaded on systems using SELinux, which includes Fedora. This patch disables the execstack flag. (Note: Red Hat do this in their openssl packaging.)
--- meta/recipes-connectivity/openssl/openssl.inc | 6 +++++- .../recipes-connectivity/openssl/openssl_0.9.8o.bb | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-)
meta/recipes-connectivity/openssl/openssl.inc +5 -1
@@ -15,7 +15,11 @@ S = "${WORKDIR}/openssl-${PV}" AR_append = " r" CFLAG = "${@base_conditional('SITEINFO_ENDIANESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \ - -DTERMIO ${FULL_OPTIMIZATION} -Wall" + -DTERMIO ${FULL_OPTIMIZATION}" + +# Avoid binaries being marked as requiring an executable stack (which causes +# issues with SELinux on the host) +CFLAG_append_virtclass-native = " -Wa,--noexecstack" # -02 does not work on mipsel: ssh hangs when it tries to read /dev/urandom CFLAG_mtx-1 := "${@'${CFLAG}'.replace('-O2', '')}"
meta/recipes-connectivity/openssl/openssl_0.9.8o.bb +1 -1
@@ -1,6 +1,6 @@ require openssl.inc -PR = "r0" +PR = "r1" SRC_URI += "file://debian/ca.patch \ file://debian/config-hurd.patch;apply=no \ file://debian/debian-targets.patch \
Signature · 1 line
1.7.3.3
PATCH 4/14 busybox: import upstream patch for make 3.82
In reply to Joshua Lock--- .../busybox/busybox-1.16.2/make-382-fix.patch | 25 ++++++++++++++++++++ meta/recipes-core/busybox/busybox_1.16.2.bb | 3 +- 2 files changed, 27 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-core/busybox/busybox-1.16.2/make-382-fix.patch
meta/recipes-core/busybox/busybox-1.16.2/make-382-fix.patch new file +25 -0
@@ -0,0 +1,25 @@ +From ef6c6d8cfef071435ccf275ad404a501626b706c Mon Sep 17 00:00:00 2001 +From: Thomas Chou <[email protected]> +Date: Tue, 19 Oct 2010 07:17:12 +0000 +Subject: mkmakefile: make 3.82 fix + +Signed-off-by: Thomas Chou <[email protected]> +Signed-off-by: Denys Vlasenko <[email protected]> +--- +diff --git a/scripts/mkmakefile b/scripts/mkmakefile +index 7f9d544..9fc51a7 100755 +--- a/scripts/mkmakefile ++++ b/scripts/mkmakefile +@@ -31,6 +31,9 @@ all: + + Makefile:; + +-\$(filter-out all Makefile,\$(MAKECMDGOALS)) %/: ++\$(filter-out all Makefile,\$(MAKECMDGOALS)): ++ \$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT) \$@ ++ ++%/: + \$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT) \$@ + EOF +-- +cgit v0.8.2.1
meta/recipes-core/busybox/busybox_1.16.2.bb +2 -1
@@ -1,5 +1,5 @@ require busybox.inc -PR = "r0" +PR = "r1" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://udhcpscript.patch \
@@ -8,6 +8,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://get_header_tar.patch \ file://busybox-appletlib-dependency.patch \ file://run-parts.in.usr-bin.patch \ + file://make-382-fix.patch \ file://find-touchscreen.sh \ file://busybox-cron \ file://busybox-httpd \
Signature · 1 line
1.7.3.3
PATCH 3/14 eglibc: fix build of eglibc-initial for make 3.82
In reply to Joshua LockMake 3.82, as shipped with Fedora 14, fixes some holes in the parser which in turn breaks behaviour of some Makefiles. Most notably eglibc's.
--- .../eglibc/eglibc-2.12/fix-for-make-3.82.diff | 25 ++++++++++++++++++++ meta/recipes-core/eglibc/eglibc_2.12.bb | 5 ++- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/eglibc/eglibc-2.12/fix-for-make-3.82.diff
meta/recipes-core/eglibc/eglibc-2.12/fix-for-make-3.82.diff new file +25 -0
@@ -0,0 +1,25 @@ +Make 3.82, as shipped with Fedora 14, fixes some holes in the parser which in +turn breaks behaviour of some Makefiles. Most notably eglibc's. + +http://www.mail-archive.com/[email protected]/msg06220.html + +Fix back-ported from glibc/eglibc revision control. + +JL 13/10/10 + +Index: libc/manual/Makefile +=================================================================== +--- libc.orig/manual/Makefile ++++ libc/manual/Makefile +@@ -243,7 +243,10 @@ ifdef objpfx + .PHONY: stubs + stubs: $(objpfx)stubs + endif +-$(objpfx)stubs ../po/manual.pot $(objpfx)stamp%: ++$(objpfx)stubs ../po/manual.pot: ++ $(make-target-directory) ++ touch $@ ++$(objpfx)stamp%: + $(make-target-directory) + touch $@ +
meta/recipes-core/eglibc/eglibc_2.12.bb +3 -2
@@ -2,7 +2,7 @@ require eglibc.inc DEPENDS += "gperf-native" FILESPATHPKG =. "eglibc-svn:" -PR = "r9" +PR = "r10" EGLIBC_BRANCH="eglibc-2_12" SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http \
@@ -11,7 +11,8 @@ SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http file://shorten-build-commands.patch \ file://mips-rld-map-check.patch \ file://etc/ld.so.conf \ - file://generate-supported.mk" + file://generate-supported.mk \ + file://fix-for-make-3.82.diff" SRC_URI_append_virtclass-nativesdk = " file://ld-search-order.patch" S = "${WORKDIR}/${EGLIBC_BRANCH}/libc" B = "${WORKDIR}/build-${TARGET_SYS}"
Signature · 1 line
1.7.3.3
PATCH 6/14 busybox: additional fixes for Make 3.82
In reply to Joshua LockThere where still some mixed implicit and normal rules in the Busybox Makefile, Update our existing make-382.patch to split these into separate rules.
--- .../busybox/busybox-1.16.2/make-382-fix.patch | 43 +++++++++++++++++--- 1 files changed, 37 insertions(+), 6 deletions(-)
meta/recipes-core/busybox/busybox-1.16.2/make-382-fix.patch +37 -6
@@ -6,10 +6,10 @@ Subject: mkmakefile: make 3.82 fix Signed-off-by: Thomas Chou <[email protected]> Signed-off-by: Denys Vlasenko <[email protected]> --- -diff --git a/scripts/mkmakefile b/scripts/mkmakefile -index 7f9d544..9fc51a7 100755 ---- a/scripts/mkmakefile -+++ b/scripts/mkmakefile +Index: busybox-1.16.2/scripts/mkmakefile +=================================================================== +--- busybox-1.16.2.orig/scripts/mkmakefile ++++ busybox-1.16.2/scripts/mkmakefile @@ -31,6 +31,9 @@ all: Makefile:;
@@ -21,5 +21,36 @@ index 7f9d544..9fc51a7 100755 +%/: \$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT) \$@ EOF --- -cgit v0.8.2.1 +Index: busybox-1.16.2/Makefile +=================================================================== +--- busybox-1.16.2.orig/Makefile ++++ busybox-1.16.2/Makefile +@@ -428,11 +428,15 @@ ifeq ($(config-targets),1) + -include $(srctree)/arch/$(ARCH)/Makefile + export KBUILD_DEFCONFIG + +-config %config: scripts_basic outputmakefile FORCE ++config: scripts_basic outputmakefile FORCE + $(Q)mkdir -p include + $(Q)$(MAKE) $(build)=scripts/kconfig $@ + $(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease + ++%config: scripts_basic outputmakefile FORCE ++ $(Q)mkdir -p include ++ $(Q)$(MAKE) $(build)=scripts/kconfig $@ ++ $(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease + else + # =========================================================================== + # Build targets only - this includes busybox, arch specific targets, clean +@@ -1280,7 +1284,10 @@ endif + $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@) + + # Modules +-/ %/: prepare scripts FORCE ++%/: prepare scripts FORCE ++ $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ ++ $(build)=$(build-dir) ++/: prepare scripts FORCE + $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \ + $(build)=$(build-dir) + %.ko: prepare scripts FORCE
Signature · 1 line
1.7.3.3
PATCH 7/14 linux-libc-headers: fix for Make 3.82
In reply to Joshua LockFix the kernel Makefile for use with Make 3.82 by splitting mixed implicit and normal rules into separate rules.
--- .../connector-msg-size-fix.patch | 4 +- .../linux-libc-headers/make-382.patch | 36 ++++++++++++++++++++ .../linux-libc-headers_2.6.34.bb | 7 ++-- 3 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-kernel/linux-libc-headers/linux-libc-headers/make-382.patch
meta/recipes-kernel/linux-libc-headers/linux-libc-headers/connector-msg-size-fix.patch +2 -2
@@ -14,8 +14,8 @@ Signed-off-by: Zhai Edwin <[email protected]> Index: linux-2.6.34/include/linux/connector.h =================================================================== ---- linux-2.6.34.orig/include/linux/connector.h 2010-09-30 14:15:25.000000000 +0800 -+++ linux-2.6.34/include/linux/connector.h 2010-09-30 14:15:43.000000000 +0800 +--- linux-2.6.34.orig/include/linux/connector.h ++++ linux-2.6.34/include/linux/connector.h @@ -48,7 +48,7 @@ /* * Maximum connector's message size.
meta/recipes-kernel/linux-libc-headers/linux-libc-headers/make-382.patch new file +36 -0
@@ -0,0 +1,36 @@ +Index: linux-2.6.34/arch/powerpc/Makefile +=================================================================== +--- linux-2.6.34.orig/arch/powerpc/Makefile ++++ linux-2.6.34/arch/powerpc/Makefile +@@ -158,9 +158,10 @@ drivers-$(CONFIG_OPROFILE) += arch/power + # Default to zImage, override when needed + all: zImage + +-BOOT_TARGETS = zImage zImage.initrd uImage zImage% dtbImage% treeImage.% cuImage.% simpleImage.% ++BOOT_TARGETS1 = zImage zImage.initrd uImage ++BOOT_TARGETS2 = zImage% dtbImage% treeImage.% cuImage.% simpleImage.% + +-PHONY += $(BOOT_TARGETS) ++PHONY += $(BOOT_TARGETS1) $(BOOT_TARGETS2) + + boot := arch/$(ARCH)/boot + +@@ -175,10 +176,16 @@ relocs_check: arch/powerpc/relocs_check. + zImage: relocs_check + endif + +-$(BOOT_TARGETS): vmlinux ++$(BOOT_TARGETS1): vmlinux + $(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@) + +-bootwrapper_install %.dtb: ++$(BOOT_TARGETS2): vmlinux ++ $(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@) ++ ++bootwrapper_install: ++ $(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@) ++ ++%.dtb: + $(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@) + + define archhelp
meta/recipes-kernel/linux-libc-headers/linux-libc-headers_2.6.34.bb +4 -3
@@ -2,11 +2,12 @@ require linux-libc-headers.inc INHIBIT_DEFAULT_DEPS = "1" DEPENDS += "unifdef-native" -PR = "r1" +PR = "r2" SRC_URI += "file://hayes-gone.patch \ - file://ppc_glibc_build_fix.patch \ - file://connector-msg-size-fix.patch" + file://ppc_glibc_build_fix.patch \ + file://make-382.patch \ + file://connector-msg-size-fix.patch" S = "${WORKDIR}/linux-${PV}"
Signature · 1 line
1.7.3.3
PATCH 5/14 procps: fix for build against make 3.82
In reply to Joshua Lock--- .../procps-3.2.7/procps-3.2.8+gmake-3.82.patch | 17 +++++++++++++++++ meta/recipes-extended/procps/procps_3.2.7.bb | 3 ++- 2 files changed, 19 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-extended/procps/procps-3.2.7/procps-3.2.8+gmake-3.82.patch
meta/recipes-extended/procps/procps-3.2.7/procps-3.2.8+gmake-3.82.patch new file +17 -0
@@ -0,0 +1,17 @@ +Fix for stricter Makefile parser in Make 3.82 take from Gentoo bugzilla: +http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-process/procps/files/procps-3.2.8%2Bgmake-3.82.patch?revision=1.1 + +Index: procps-3.2.8/Makefile +=================================================================== +--- procps-3.2.8.orig/Makefile ++++ procps-3.2.8/Makefile +@@ -174,7 +174,8 @@ INSTALL := $(BINFILES) $(MANFILES) + # want this rule first, use := on ALL, and ALL not filled in yet + all: do_all + +--include */module.mk ++-include proc/module.mk ++-include ps/module.mk + + do_all: $(ALL) +
meta/recipes-extended/procps/procps_3.2.7.bb +2 -1
@@ -1,6 +1,6 @@ require procps.inc -PR = "r9" +PR = "r10" inherit update-rc.d update-alternatives
@@ -16,6 +16,7 @@ SRC_URI += "file://procmodule.patch;patch=1 \ file://linux-limits.patch;patch=1 \ file://sysctl.conf \ file://procps.init \ + file://procps-3.2.8+gmake-3.82.patch \ " FILES = "${bindir}/top.${PN} ${base_bindir}/ps.${PN} ${bindir}/uptime.${PN} ${base_bindir}/kill.${PN} \
Signature · 1 line
1.7.3.3
PATCH 8/14 gstreamer: fix to comply with make 3.82's stricter parser
In reply to Joshua Lock--- .../gstreamer/gstreamer-0.10.29/make-382.patch | 32 ++++++++++++++++++++ .../gstreamer/gstreamer_0.10.29.bb | 7 ++-- 2 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer-0.10.29/make-382.patch
meta/recipes-multimedia/gstreamer/gstreamer-0.10.29/make-382.patch new file +32 -0
@@ -0,0 +1,32 @@ +The whitespaces instead of tabs here cause the new, stricter, parser in make +3.82 to barf on the doc makefiles. + +This patch should no longer be required in more recent gstreamer version + +JL - 14/12/10 + +Index: gstreamer-0.10.29/common/gtk-doc.mak +=================================================================== +--- gstreamer-0.10.29.orig/common/gtk-doc.mak ++++ gstreamer-0.10.29/common/gtk-doc.mak +@@ -232,6 +232,6 @@ dist-hook: dist-check-gtkdoc dist-hook-l + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) +- -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html ++ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs +Index: gstreamer-0.10.29/common/gtk-doc-plugins.mak +=================================================================== +--- gstreamer-0.10.29.orig/common/gtk-doc-plugins.mak ++++ gstreamer-0.10.29/common/gtk-doc-plugins.mak +@@ -352,7 +352,7 @@ dist-hook: dist-check-gtkdoc dist-hook-l + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) +- -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html ++ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs +
meta/recipes-multimedia/gstreamer/gstreamer_0.10.29.bb +4 -3
@@ -9,11 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \ file://gst/gst.h;beginline=1;endline=21;md5=8e5fe5e87d33a04479fde862e238eaa4" DEPENDS = "glib-2.0 gettext libxml2 bison-native flex-native" -PR = "r0" +PR = "r1" SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \ - file://check_fix.patch;patch=1 \ - file://gst-inspect-check-error.patch;patch=1" + file://check_fix.patch \ + file://gst-inspect-check-error.patch \ + file://make-382.patch" inherit autotools pkgconfig
Signature · 1 line
1.7.3.3
PATCH 9/14 gst-plugins: fix for make 3.82
In reply to Joshua Lock--- .../gstreamer/gst-plugins-bad_0.10.19.bb | 2 +- .../gstreamer/gst-plugins-base_0.10.29.bb | 2 +- .../gstreamer/gst-plugins-good_0.10.23.bb | 2 +- .../gstreamer/gst-plugins-ugly_0.10.15.bb | 2 +- meta/recipes-multimedia/gstreamer/gst-plugins.inc | 5 +++- .../gstreamer/gst-plugins/make-382.patch | 25 ++++++++++++++++++++ 6 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-multimedia/gstreamer/gst-plugins/make-382.patch
meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.19.bb +1 -1
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ DEPENDS += "gst-plugins-base libmusicbrainz tremor" -PR = "r2" +PR = "r3" inherit gettext
meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.29.bb +1 -1
@@ -10,7 +10,7 @@ DEPENDS += "virtual/libx11 alsa-lib freetype gnome-vfs liboil libogg libvorbis l RDEPENDS += "gnome-vfs-plugin-file gnome-vfs-plugin-http gnome-vfs-plugin-ftp \ gnome-vfs-plugin-sftp" -PR = "r1" +PR = "r2" inherit gettext
meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.23.bb +1 -1
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ DEPENDS += "gst-plugins-base gconf cairo jpeg libpng gtk+ zlib libid3tag flac \ speex" -PR = "r0" +PR = "r1" inherit gettext
meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.15.bb +1 -1
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://gst/mpegstream/gstmpegparse.h;beginline=1;endline=18;md5=ff65467b0c53cdfa98d0684c1bc240a9" DEPENDS += "gst-plugins-base libid3tag libmad mpeg2dec liba52 lame" -PR = "r0" +PR = "r1" inherit gettext
meta/recipes-multimedia/gstreamer/gst-plugins.inc +4 -1
@@ -7,7 +7,10 @@ DEPENDS = "gstreamer" inherit autotools pkgconfig -SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2" +FILESPATH =. "${FILE_DIRNAME}/gst-plugins:" + +SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \ + file://make-382.patch" EXTRA_OECONF = "--disable-valgrind --disable-debug --disable-examples "
meta/recipes-multimedia/gstreamer/gst-plugins/make-382.patch new file +25 -0
@@ -0,0 +1,25 @@ +Index: gst-plugins-base-0.10.29/common/gtk-doc-plugins.mak +=================================================================== +--- gst-plugins-base-0.10.29.orig/common/gtk-doc-plugins.mak ++++ gst-plugins-base-0.10.29/common/gtk-doc-plugins.mak +@@ -352,7 +352,7 @@ dist-hook: dist-check-gtkdoc dist-hook-l + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) +- -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html ++ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs + +Index: gst-plugins-base-0.10.29/common/gtk-doc.mak +=================================================================== +--- gst-plugins-base-0.10.29.orig/common/gtk-doc.mak ++++ gst-plugins-base-0.10.29/common/gtk-doc.mak +@@ -232,6 +232,6 @@ dist-hook: dist-check-gtkdoc dist-hook-l + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) +- -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html ++ -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + + .PHONY : dist-hook-local docs
Signature · 1 line
1.7.3.3
PATCH 10/14 libowl-av: fix for Make 3.82
In reply to Joshua Lock--- .../owl-video-widget/libowl-av/make-382.patch | 11 +++++++++++ .../recipes-sato/owl-video-widget/libowl-av_svn.bb | 5 +++-- 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch
meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch new file +11 -0
@@ -0,0 +1,11 @@ +Index: libowl-av/Makefile.am +=================================================================== +--- libowl-av.orig/Makefile.am ++++ libowl-av/Makefile.am +@@ -14,5 +14,5 @@ EXTRA_DIST = libowl-av.pc.in libowl-av.v + MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp intltool-extract intltool-merge intltool-update install-sh ltmain.sh Makefile.in missing + + snapshot: +- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` ++ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` +
meta/recipes-sato/owl-video-widget/libowl-av_svn.bb +3 -2
@@ -13,11 +13,12 @@ RDEPENDS = "gst-meta-base" RRECOMMENDS = "gst-meta-audio gst-meta-video" PV = "0.0+svnr${SRCREV}" -PR = "r4" +PR = "r5" S = "${WORKDIR}/${PN}" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http \ - file://gst_change_state.patch" + file://gst_change_state.patch \ + file://make-382.patch" inherit autotools pkgconfig
Signature · 1 line
1.7.3.3
PATCH 11/14 owl-video-widget: fix Makefile for super strict make 3.82
In reply to Joshua Lock--- .../owl-video-widget/owl-video/make-382.patch | 15 +++++++++++++++ .../recipes-sato/owl-video-widget/owl-video_svn.bb | 3 ++- 2 files changed, 17 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-sato/owl-video-widget/owl-video/make-382.patch
meta/recipes-sato/owl-video-widget/owl-video/make-382.patch new file +15 -0
@@ -0,0 +1,15 @@ +Make 3.82 is much stricter and demands tabs. Obey. + +JL - 15/12/10 + +Index: video/Makefile.am +=================================================================== +--- video.orig/Makefile.am ++++ video/Makefile.am +@@ -4,5 +4,5 @@ SUBDIRS = src + MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp intltool-extract intltool-merge intltool-update install-sh ltmain.sh Makefile.in missing + + snapshot: +- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` ++ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` +
meta/recipes-sato/owl-video-widget/owl-video_svn.bb +2 -1
@@ -21,7 +21,8 @@ SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=video;proto=http \ file://stock_volume-min.png \ file://stock_volume-med.png \ file://stock_volume-max.png \ - file://owl-video-widget.desktop" + file://owl-video-widget.desktop \ + file://make-382.patch" inherit autotools pkgconfig
Signature · 1 line
1.7.3.3
PATCH 12/14 dates: fix for Make 3.82
In reply to Joshua Lock--- meta/recipes-sato/pimlico/dates/make-382.patch | 16 ++++++++++++++++ meta/recipes-sato/pimlico/dates_git.bb | 5 +++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-sato/pimlico/dates/make-382.patch
meta/recipes-sato/pimlico/dates/make-382.patch new file +16 -0
@@ -0,0 +1,16 @@ +Make 3.82 is offended by the use of spaces instead of tabs. This has been fixed +in upstream git. + +JL - 15/12/10 + +Index: git/Makefile.am +=================================================================== +--- git.orig/Makefile.am ++++ git/Makefile.am +@@ -7,5 +7,5 @@ DISTCLEANFILES = intltool-extract intlto + MAINTAINERCLEANFILES = $(DISTCLEANFILES) aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing + + snapshot: +- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` ++ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` +
meta/recipes-sato/pimlico/dates_git.bb +3 -2
@@ -6,8 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ file://src/gconf-bridge.c;endline=22;md5=ad7626c6daf4aec590474a243f4912fa" PV = "0.4.11+git${SRCPV}" -PR = "r0" +PR = "r1" S = "${WORKDIR}/git" -SRC_URI = "git://git.gnome.org/${PN};protocol=git" +SRC_URI = "git://git.gnome.org/${PN};protocol=git \ + file://make-382.patch"
Signature · 1 line
1.7.3.3
PATCH 13/14 contacts: fix for make 3.82
In reply to Joshua Lock--- meta/recipes-sato/pimlico/contacts/make-382.patch | 14 ++++++++++++++ meta/recipes-sato/pimlico/contacts_git.bb | 5 +++-- 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-sato/pimlico/contacts/make-382.patch
meta/recipes-sato/pimlico/contacts/make-382.patch new file +14 -0
@@ -0,0 +1,14 @@ +Fix for stricter parser in make 3.82. This fix has been pushed to upstream git. + +JL - 15/12/10 + +Index: git/Makefile.am +=================================================================== +--- git.orig/Makefile.am ++++ git/Makefile.am +@@ -11,4 +11,4 @@ DISTCLEANFILES = $(INTLTOOL_BUILT) + MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp $(INTLTOOL_BUILT:=.in) install-sh ltmain.sh mkinstalldirs Makefile.in missing + + snapshot: +- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` ++ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
meta/recipes-sato/pimlico/contacts_git.bb +3 -2
@@ -6,11 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://src/contacts-gtk.c;endline=23;md5=e1ee9b9e72045f2d3aa44cf17313b46e" PV = "0.12+git${SRCPV}" -PR = "r0" +PR = "r1" S = "${WORKDIR}/git" -SRC_URI =+ "git://git.gnome.org/${PN};protocol=git" +SRC_URI =+ "git://git.gnome.org/${PN};protocol=git \ + file://make-382.patch" S = "${WORKDIR}/git"
Signature · 1 line
1.7.3.3
PATCH 14/14 web-webkit: fix for make 3.82
In reply to Joshua Lock--- meta/recipes-sato/web/web-webkit/make-382.patch | 15 +++++++++++++++ meta/recipes-sato/web/web-webkit_svn.bb | 5 +++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-sato/web/web-webkit/make-382.patch
meta/recipes-sato/web/web-webkit/make-382.patch new file +15 -0
@@ -0,0 +1,15 @@ +Make 3.82 does not allow 8 spaces instead of a tab + +JL - 15/12/10 + +Index: webkit/Makefile.am +=================================================================== +--- webkit.orig/Makefile.am ++++ webkit/Makefile.am +@@ -5,5 +5,5 @@ SUBDIRS = src data + MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing + + snapshot: +- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` ++ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` +
meta/recipes-sato/web/web-webkit_svn.bb +3 -2
@@ -8,10 +8,11 @@ SECTION = "x11" DEPENDS = "libxml2 glib-2.0 gtk+ libglade webkit-gtk curl gconf js libowl" PV = "0.0+svnr${SRCREV}" -PR = "r2" +PR = "r3" SRC_URI = "svn://svn.o-hand.com/repos/web/branches;module=webkit;proto=http \ - file://link-with-g++.patch;patch=1" + file://link-with-g++.patch \ + file://make-382.patch" S = "${WORKDIR}/webkit"
Signature · 1 line
1.7.3.3
Re: [PATCH 01/14] openssl-native: disable execstack flag to prevent problems with SELinux
In reply to Paul EggletonQuoted 16 lines · Paul Eggleton
The execstack flag gets set on libcrypto.so by default which causes SELinux to prevent it from being loaded on systems using SELinux, which includes Fedora. This patch disables the execstack flag. (Note: Red Hat do this in their openssl packaging.)
Signed-off-by Paul Eggleton<[email protected]>--- meta/recipes-connectivity/openssl/openssl.inc | 6 +++++- .../recipes-connectivity/openssl/openssl_0.9.8o.bb | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-)meta/recipes-connectivity/openssl/openssl.inc +0
-0
meta/recipes-connectivity/openssl/openssl.inc S = "${WORKDIR}/openssl-${PV}" · line 18
Quoted 5 lines
meta/recipes-connectivity/openssl/openssl.inc +1
-1@@ -15,7 +15,11 @@ S = "${WORKDIR}/openssl-${PV}" AR_append = " r" CFLAG = "${@base_conditional('SITEINFO_ENDIANESS', 'le', '-DL_ENDIAN', '-DB_ENDIAN', d)} \ - -DTERMIO ${FULL_OPTIMIZATION} -Wall" + -DTERMIO ${FULL_OPTIMIZATION}"
Why do we need to remove -Wall? Doesn't that reduce our visibility into potential issues?
Quoted 19 lines
meta/recipes-connectivity/openssl/openssl.inc +4
-0+ +# Avoid binaries being marked as requiring an executable stack (which causes +# issues with SELinux on the host) +CFLAG_append_virtclass-native = " -Wa,--noexecstack" # -02 does not work on mipsel: ssh hangs when it tries to read /dev/urandom CFLAG_mtx-1 := "${@'${CFLAG}'.replace('-O2', '')}"meta/recipes-connectivity/openssl/openssl_0.9.8o.bb +1
-1@@ -1,6 +1,6 @@ require openssl.inc -PR = "r0" +PR = "r1" SRC_URI += "file://debian/ca.patch \ file://debian/config-hurd.patch;apply=no \ file://debian/debian-targets.patch \
Signature · 2 lines
Darren Hart Yocto Linux Kernel
Re: [PATCH 01/14] openssl-native: disable execstack flag to prevent problems with SELinux
Quoted 5 lines · On Wednesday 15 December 2010 19:28:52 Darren Hart wrote:
meta/recipes-connectivity/openssl/openssl.inc S = "${WORKDIR}/openssl-${PV}" · line 18
Quoted 2 lines
meta/recipes-connectivity/openssl/openssl.inc +1
-1- -DTERMIO ${FULL_OPTIMIZATION} -Wall" + -DTERMIO ${FULL_OPTIMIZATION}"Why do we need to remove -Wall? Doesn't that reduce our visibility into potential issues?
We don't - actually this was a mistake that I was sure had I removed from the original patch. -Wall should be put back in.
Cheers,
Paul
---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47
This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.
Joshua Lock
AppliedRe: [PATCH 01/14] openssl-native: disable execstack flag to prevent problems with SELinux
Quoted 8 lines · Paul Eggleton
Quoted 5 lines · On Wednesday 15 December 2010 19:28:52 Darren Hart wrote:
meta/recipes-connectivity/openssl/openssl.inc S = "${WORKDIR}/openssl-${PV}" · line 18
Quoted 2 lines
meta/recipes-connectivity/openssl/openssl.inc +1
-1- -DTERMIO ${FULL_OPTIMIZATION} -Wall" + -DTERMIO ${FULL_OPTIMIZATION}"Why do we need to remove -Wall? Doesn't that reduce our visibility into potential issues?
We don't - actually this was a mistake that I was sure had I removed from the original patch. -Wall should be put back in.
I've merged the patch which does this to josh/laverne.
Cheers,
Joshua
Signature · 2 lines
Joshua Lock
Intel Open Source Technology CentreRe: [PATCH 11/14] owl-video-widget: fix Makefile for super strict make 3.82
In reply to Joshua LockHi Josh,
After including your patch, my build was still failing on the owl-video recipe. I noticed PR bump is missing in this commit.
Thanks,
Nitin
Quoted 64 lines
-----Original Message-----
From: [email protected] [mailto:poky- [email protected]] On Behalf Of Joshua Lock
Sent: Wednesday, December 15, 2010 4:28 AM
To: [email protected]
Subject: [poky] [PATCH 11/14] owl-video-widget: fixMakefilefor super strict make 3.82Signed-off-by Joshua Lock <[email protected]>--- .../owl-video-widget/owl-video/make-382.patch | 15 +++++++++++++++ .../recipes-sato/owl-video-widget/owl-video_svn.bb | 3 ++- 2 files changed, 17 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-sato/owl-video-widget/owl-video/make-382.patch
(quoted diff) +0
-0382.patch
b/meta/recipes-sato/owl-video-widget/owl-video/make-382.patchnew file mode 100644
index 0000000..7d8aff7meta/recipes-sato/owl-video-widget/owl-video/make-382.patch new file +10
-0@@ -0,0 +1,15 @@ +Make 3.82 is much stricter and demands tabs. Obey. + +JL - 15/12/10 + +Index: video/Makefile.am +=================================================================== +--- video.orig/Makefile.am ++++ video/Makefile.am +@@ -4,5 +4,5 @@ SUBDIRS = src + MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.subconfigure depcomp intltool-extract intltool-merge intltool-update install-sh
ltmain.shMakefile.in missingmeta/recipes-sato/owl-video-widget/owl-video/make-382.patch new file +5
-0+ + snapshot: +- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` ++ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` +meta/recipes-sato/owl-video-widget/owl-video_svn.bb +2
-2@@ -21,7 +21,8 @@ SRC_URI = "svn://svn.o- hand.com/repos/misc/trunk;module=video;proto=http \ file://stock_volume-min.png \ file://stock_volume-med.png \ file://stock_volume-max.png \ - file://owl-video-widget.desktop" + file://owl-video-widget.desktop \ + file://make-382.patch" inherit autotools pkgconfig --1.7.3.3
_______________________________________________
poky mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/poky
Re: [PATCH 11/14] owl-video-widget: fix Makefile for super strict make 3.82
Quoted 2 lines · Nitin A
Hi Josh, After including your patch, my build was still failing on the owl-video recipe. I noticed PR bump is missing in this commit.
Whoops, PR bump pushed.
Cheers,
Joshua
Signature · 2 lines
Joshua Lock
Intel Open Source Technology Centre