mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-14 05:49:57 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'denzil-next' into denzil

Browse Source
This commit is contained in:
Eric Bénard
2012-08-13 10:40:53 +02:00
parent 568b98668f bb03e3f181
commit 6e43477701
6 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-core/systemd/systemd/var-run.conf
+4
View File
@@ -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 - -
meta-oe/recipes-core/systemd/systemd_git.bb
+4 -1
View File
@@ -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 (){
meta-oe/recipes-devtools/ltrace/ltrace_0.5.3.bb
+2 -2
View File
@@ -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() {
meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0005-add-XWindowManager-Xsession.d-script.patch
+7 -10
View File
@@ -9,18 +9,15 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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
meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb
+1 -1
View File
@@ -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
meta-oe/recipes-support/cramfs/cramfs_cvs.bb
+2 -1
View File
@@ -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() {