From 4283f7e0795b74532a010b0080f75a917b469f34 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 12 Mar 2014 13:05:04 +0200 Subject: [PATCH] systemd: fix systemd 211 build on non-fedora hosts --- .../systemd-10_nah.-no-ln-relative.patch | 79 +++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 packages/sysutils/systemd/patches/systemd-10_nah.-no-ln-relative.patch diff --git a/packages/sysutils/systemd/patches/systemd-10_nah.-no-ln-relative.patch b/packages/sysutils/systemd/patches/systemd-10_nah.-no-ln-relative.patch new file mode 100644 index 0000000000..b6b9f9c0a7 --- /dev/null +++ b/packages/sysutils/systemd/patches/systemd-10_nah.-no-ln-relative.patch @@ -0,0 +1,79 @@ +From e5ecdd5f5a72d9ca84d0e080456887f38ad4e3d4 Mon Sep 17 00:00:00 2001 +From: Stefan Saraev +Date: Wed, 12 Mar 2014 12:42:06 +0200 +Subject: [PATCH] nah. no ln --relative + +It is unclear that systemd now requires very recent coreutils +in order to compile. + +I will not upgrade my debian wheezy machines to jessie, +nor I will switch to fedora for no good reason. We are not going +to tell our users to do so just to be able to build OpenELEC. +--- + Makefile.am | 21 ++++++--------------- + 1 files changed, 6 insertions(+), 15 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index bcf20df..1baf2bc 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -207,8 +207,8 @@ define move-to-rootlibdir + if test "$(libdir)" != "$(rootlibdir)"; then \ + $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \ + so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \ +- rm -f $(DESTDIR)$(libdir)/$$libname && \ +- $(LN_S) --relative -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \ ++ so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \ ++ $(LN_S) -f $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \ + mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \ + fi + endef +@@ -267,9 +267,9 @@ install-aliases-hook: + set -- $(SYSTEM_UNIT_ALIASES) && \ + dir=$(systemunitdir) && $(install-aliases) + set -- $(USER_UNIT_ALIASES) && \ +- dir=$(userunitdir) && $(install-relative-aliases) ++ dir=$(userunitdir) && $(install-aliases) + set -- $(GENERAL_ALIASES) && \ +- dir= && $(install-relative-aliases) ++ dir= && $(install-aliases) + + define install-aliases + while [ -n "$$1" ]; do \ +@@ -280,15 +280,6 @@ define install-aliases + done + endef + +-define install-relative-aliases +- while [ -n "$$1" ]; do \ +- $(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \ +- rm -f $(DESTDIR)$$dir/$$2 && \ +- $(LN_S) --relative $(DESTDIR)$$1 $(DESTDIR)$$dir/$$2 && \ +- shift 2 || exit $$?; \ +- done +-endef +- + INSTALL_EXEC_HOOKS += \ + install-target-wants-hook \ + install-directories-hook \ +@@ -1869,7 +1860,7 @@ systemd_dbus1_generator_LDADD = \ + dbus1-generator-install-hook: + $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir) + $(AM_V_RM)rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator +- $(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator ++ $(AM_V_LN)$(LN_S) -f $(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator + + dbus1-generator-uninstall-hook: + rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator +@@ -2002,7 +1993,7 @@ systemd_bus_proxyd_LDADD = \ + bus-proxyd-install-hook: + $(AM_V_at)$(MKDIR_P) $(DESTDIR)$(bindir) + $(AM_V_RM)rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge +- $(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(rootlibexecdir)/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge ++ $(AM_V_LN)$(LN_S) -f $(rootlibexecdir)/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge + + bus-proxyd-uninstall-hook: + rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge +-- +1.7.2.5 +