Patchwork systemd: Upgrade 212 -> 213

login
register
mail settings
Submitter Khem Raj
Date May 29, 2014, 7:10 p.m.
Message ID <1401390620-21874-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/72973/
State New
Headers show

Comments

Khem Raj - May 29, 2014, 7:10 p.m.
boots on all qemu machines

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-core/systemd/{systemd_212.bb => systemd_213.bb} |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename meta/recipes-core/systemd/{systemd_212.bb => systemd_213.bb} (99%)
Ross Burton - May 30, 2014, 2:28 p.m.
On 29 May 2014 20:10, Khem Raj <raj.khem@gmail.com> wrote:
> +       sed -i '/ln --relative --help/d' ${S}/configure.ac
>         sed -i -e 's:\$(LN_S) --relative -f:lnr:g' ${S}/Makefile.am
>         sed -i -e 's:\$(LN_S) --relative:lnr:g' ${S}/Makefile.am

Introducing lnr was my fault but this is getting a bit convoluted, can
the ln-munging be replaced with a patch so it is less magical?

Ross
Khem Raj - May 30, 2014, 3:19 p.m.
On Fri, May 30, 2014 at 7:28 AM, Burton, Ross <ross.burton@intel.com> wrote:
>> +       sed -i '/ln --relative --help/d' ${S}/configure.ac
>>         sed -i -e 's:\$(LN_S) --relative -f:lnr:g' ${S}/Makefile.am
>>         sed -i -e 's:\$(LN_S) --relative:lnr:g' ${S}/Makefile.am
>
> Introducing lnr was my fault but this is getting a bit convoluted, can
> the ln-munging be replaced with a patch so it is less magical?

We will have to do a patch that will not be accepted in systemd since
now they explicitly enquire
if ln supports it or not otherwise they bailout. So what are our
options, one carry a patch around that wont go anywhere or use lnr
that can be removed once we have all supported distros have ln
--relative available. I dont see any advantage of 1 over 2.

Patch

diff --git a/meta/recipes-core/systemd/systemd_212.bb b/meta/recipes-core/systemd/systemd_213.bb
similarity index 99%
rename from meta/recipes-core/systemd/systemd_212.bb
rename to meta/recipes-core/systemd/systemd_213.bb
index 233bd31..5f90576 100644
--- a/meta/recipes-core/systemd/systemd_212.bb
+++ b/meta/recipes-core/systemd/systemd_213.bb
@@ -17,9 +17,9 @@  SECTION = "base/shell"
 
 inherit gtk-doc useradd pkgconfig autotools perlnative update-rc.d update-alternatives qemu systemd ptest
 
-SRCREV = "9b3310b066136b0674a926da094b7fe87a13a58b"
+SRCREV = "c9679c652b3c31f2510e8805d81630680ebc7e95"
 
-PV = "212+git${SRCPV}"
+PV = "213+git${SRCPV}"
 
 SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol=git \
            file://binfmt-install.patch \
@@ -95,6 +95,7 @@  do_configure_prepend() {
 		cp -r ${S}/units ${S}/units.pre_sed
 	fi
 	sed -i -e 's:=/root:=${ROOT_HOME}:g' ${S}/units/*.service*
+	sed -i '/ln --relative --help/d' ${S}/configure.ac
 	sed -i -e 's:\$(LN_S) --relative -f:lnr:g' ${S}/Makefile.am
 	sed -i -e 's:\$(LN_S) --relative:lnr:g' ${S}/Makefile.am
 }