From a8aa197265cbc2af632ab4e50bd21171f9840942 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 28 Jul 2012 12:05:18 +0000 Subject: [PATCH 1/5] v4l-utils 0.8.8: disable qv4l2 build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It picks up host qmake and breaks the build. Signed-off-by: Koen Kooi Signed-off-by: Eric Bénard --- .../v4l-utils/0001-disable-qv4l2-build.patch | 39 +++++++++++++++++++ .../v4l2apps/v4l-utils_0.8.8.bb | 6 ++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-disable-qv4l2-build.patch diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-disable-qv4l2-build.patch b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-disable-qv4l2-build.patch new file mode 100644 index 0000000000..4b11038c6a --- /dev/null +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-disable-qv4l2-build.patch @@ -0,0 +1,39 @@ +From 1422d4c562660407919fb753dc5f074293b395e5 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Mon, 16 Jul 2012 12:00:34 +0200 +Subject: [PATCH] disable qv4l2 build + +Signed-off-by: Koen Kooi +--- + utils/Makefile | 15 --------------- + 1 files changed, 0 insertions(+), 15 deletions(-) + +diff --git a/utils/Makefile b/utils/Makefile +index 014b82d..db74851 100644 +--- a/utils/Makefile ++++ b/utils/Makefile +@@ -5,21 +5,6 @@ all install: + $(MAKE) -C $$i $@ || exit 1; \ + done + +- # Test whether qmake is installed, and whether it is for qt4. +- @if which qmake-qt4 >/dev/null 2>&1; then \ +- QMAKE=qmake-qt4; \ +- else \ +- QMAKE=qmake; \ +- fi; \ +- if which $$QMAKE >/dev/null 2>&1; then \ +- if $$QMAKE --version 2>&1 | grep '4\.[0-9][0-9]*\.[0-9][0-9]*' >/dev/null; then \ +- if [ ! -f qv4l2/Makefile ]; then \ +- (cd qv4l2 && $$QMAKE) || exit 1; \ +- fi; \ +- $(MAKE) -C qv4l2 -f Makefile.install $@; \ +- fi \ +- fi +- + sync-with-kernel: + $(MAKE) -C keytable $@ + $(MAKE) -C v4l2-dbg $@ +-- +1.7.7.6 + diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_0.8.8.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_0.8.8.bb index 18f361f6ce..e5d1fc2bcd 100644 --- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_0.8.8.bb +++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_0.8.8.bb @@ -3,12 +3,16 @@ LICENSE = "GPLv2 & LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=48da9957849056017dc568bbc43d8975 \ file://COPYING.LIB;md5=d749e86a105281d7a44c2328acebc4b0" +PR = "r1" + DEPENDS = "jpeg" # libv4l was absorbed into this, let OE know that PROVIDES = "libv4l" -SRC_URI = "git://linuxtv.org/v4l-utils.git;protocol=git" +SRC_URI = "git://linuxtv.org/v4l-utils.git;protocol=git \ + file://0001-disable-qv4l2-build.patch \ + " # 54f16ca8183dd8ae8bf4ccc07949795aff0301f5 -> v0.8.8 tag SRCREV = "54f16ca8183dd8ae8bf4ccc07949795aff0301f5" From bf047d774bac8a9389bebb5e8860bc618ce48277 Mon Sep 17 00:00:00 2001 From: Denis Carikli Date: Thu, 28 Jun 2012 13:38:20 +0000 Subject: [PATCH 2/5] xserver-common 1.34: sync /etc/X11/Xsession.d/90xXWindowManager with x11-common(oe-core) Without that fix environments like sato cannot start because they require x-session-manager to be started instead of x-window-manager. Signed-off-by: Denis Carikli Signed-off-by: Koen Kooi --- ...5-add-XWindowManager-Xsession.d-script.patch | 17 +++++++---------- .../xserver-common/xserver-common_1.34.bb | 2 +- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWindowManager-Xsession.d-script.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWindowManager-Xsession.d-script.patch index f5c2c786d0..1782665b24 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWindowManager-Xsession.d-script.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWindowManager-Xsession.d-script.patch @@ -9,18 +9,15 @@ Signed-off-by: Martin Jansa 1 files changed, 6 insertions(+), 0 deletions(-) create mode 100644 X11/Xsession.d/90xXWindowManager -diff --git a/X11/Xsession.d/90xXWindowManager b/X11/Xsession.d/90xXWindowManager -new file mode 100644 -index 0000000..3df8435 ---- /dev/null -+++ b/X11/Xsession.d/90xXWindowManager -@@ -0,0 +1,6 @@ -+#!/bin/sh +Index: xserver-common-1.34/X11/Xsession.d/90xXWindowManager +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ xserver-common-1.34/X11/Xsession.d/90xXWindowManager 2012-06-28 15:02:22.010521773 +0200 +@@ -0,0 +1,7 @@ +if [ -x $HOME/.Xsession ]; then + exec $HOME/.Xsession ++elif [ -x /usr/bin/x-session-manager ]; then ++ exec /usr/bin/x-session-manager +else + exec /usr/bin/x-window-manager +fi --- -1.7.8.5 - diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb b/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb index 1147fca305..a7e81917f6 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -PR = "r6" +PR = "r7" # we are using a gpe-style Makefile inherit gpe From 369bd8bdda774c660756001835737104833389fe Mon Sep 17 00:00:00 2001 From: Franklin Cooper Jr Date: Thu, 2 Aug 2012 19:09:01 +0000 Subject: [PATCH 3/5] ltrace: Fix make error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fixes the make: invalid option -- '/' error Signed-off-by: Franklin S Cooper Jr Signed-off-by: Koen Kooi Signed-off-by: Eric Bénard --- meta-oe/recipes-devtools/ltrace/ltrace_0.5.3.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-devtools/ltrace/ltrace_0.5.3.bb b/meta-oe/recipes-devtools/ltrace/ltrace_0.5.3.bb index 109bf82fa8..9fd423fe91 100644 --- a/meta-oe/recipes-devtools/ltrace/ltrace_0.5.3.bb +++ b/meta-oe/recipes-devtools/ltrace/ltrace_0.5.3.bb @@ -5,7 +5,7 @@ DEPENDS = "elfutils binutils" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" -PR = "r4" +PR = "r5" # ltrace is not ported to sh3/sh4 targets at this time COMPATIBLE_TARGET_SYS = "(?!sh[34])" @@ -52,7 +52,7 @@ do_compile() { sparc*) LTRACE_ARCH=sparc ;; x86_64*) LTRACE_ARCH=x86_64 ;; esac - oe_runmake LDFLAGS=${TARGET_LDFLAGS} LIBS="-lsupc++ -liberty -Wl,-Bstatic -lelf -Wl,-Bdynamic" ${EXTRA_OEMAKE} ARCH=${LTRACE_ARCH} + oe_runmake LDFLAGS="${TARGET_LDFLAGS}" LIBS="-lsupc++ -liberty -Wl,-Bstatic -lelf -Wl,-Bdynamic" ${EXTRA_OEMAKE} ARCH=${LTRACE_ARCH} } do_install() { From a4c4a48148368c884dbc57d50195af3806c4aa37 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 7 Aug 2012 09:48:44 +0200 Subject: [PATCH 4/5] systemd: cleanup /var/run on boot and create /var/run/utmp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Angstrom uses /var/run cleanup because: Some apps (e.g. avahi-daemon) to clean up their old-style pid files and fail to start every other boot. Se we let systemd clean it on boot. Which seems general enough, so lets move var-run.conf from base-files.bbappend to systemd recipe. * /var/run/utmp was created by volatiles before, but without sysvinit installed systemd-update-utmp-runlevel.service fails to start without this file Signed-off-by: Martin Jansa Signed-off-by: Eric Bénard --- meta-oe/recipes-core/systemd/systemd/var-run.conf | 4 ++++ meta-oe/recipes-core/systemd/systemd_git.bb | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-core/systemd/systemd/var-run.conf diff --git a/meta-oe/recipes-core/systemd/systemd/var-run.conf b/meta-oe/recipes-core/systemd/systemd/var-run.conf new file mode 100644 index 0000000000..c2c18e2b99 --- /dev/null +++ b/meta-oe/recipes-core/systemd/systemd/var-run.conf @@ -0,0 +1,4 @@ +# empty /var/run +R /var/run/* - - - - - +# systemd-update-utmp-runlevel.service fails to start without this +f /var/run/utmp 0644 root root - - diff --git a/meta-oe/recipes-core/systemd/systemd_git.bb b/meta-oe/recipes-core/systemd/systemd_git.bb index f4ca72a128..b9c8a190cf 100644 --- a/meta-oe/recipes-core/systemd/systemd_git.bb +++ b/meta-oe/recipes-core/systemd/systemd_git.bb @@ -14,7 +14,7 @@ inherit gitpkgv PKGV = "v${GITPKGVTAG}" PV = "git" -PR = "r27" +PR = "r28" inherit useradd pkgconfig autotools vala perlnative @@ -22,6 +22,7 @@ SRCREV = "3eff4208ffecedd778fec260f0d4b18e94dab443" SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;protocol=git \ ${UCLIBCPATCHES} \ + file://var-run.conf \ " UCLIBCPATCHES = "" UCLIBCPATCHES_libc-uclibc = "file://paper-over-mkostemp.patch \ @@ -68,6 +69,8 @@ do_install() { # create machine-id # 20:12 < mezcalero> koen: you have three options: a) run systemd-machine-id-setup at install time, b) have / read-only and an empty file there (for stateless) and c) boot with / writable touch ${D}${sysconfdir}/machine-id + + install -m 0644 ${WORKDIR}/var-run.conf ${D}${sysconfdir}/tmpfiles.d/ } python populate_packages_prepend (){ From bb03e3f1817fb6d61b1e5952274389ee6f9bbb0d Mon Sep 17 00:00:00 2001 From: Matthew McClintock Date: Fri, 20 Jul 2012 16:35:12 +0000 Subject: [PATCH 5/5] cramfs_cvs.bb: fix compile step so it can be rerun without failing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Matthew McClintock Signed-off-by: Koen Kooi Signed-off-by: Eric Bénard --- meta-oe/recipes-support/cramfs/cramfs_cvs.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-oe/recipes-support/cramfs/cramfs_cvs.bb b/meta-oe/recipes-support/cramfs/cramfs_cvs.bb index 667097c861..d9b6c0638e 100644 --- a/meta-oe/recipes-support/cramfs/cramfs_cvs.bb +++ b/meta-oe/recipes-support/cramfs/cramfs_cvs.bb @@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/linux/COPYING;md5=9579385572eb40eded61dcb0 DEPENDS = "zlib" SRCDATE = "20110110" PV = "1.1+cvs${SRCDATE}" +PR = "r1" SRC_URI = "cvs://anonymous@cramfs.cvs.sourceforge.net/cvsroot/cramfs;module=linux" S = "${WORKDIR}/linux/scripts/cramfs" @@ -16,7 +17,7 @@ EXTRA_OEMAKE = "\ do_compile_prepend() { - ln -s GNUmakefile Makefile + ln -sf GNUmakefile Makefile } do_install() {