All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] systemd: revert use of ln relative option.
@ 2014-04-04 14:03 Eric Le Bihan
  2014-04-04 21:34 ` Thomas Petazzoni
  0 siblings, 1 reply; 2+ messages in thread
From: Eric Le Bihan @ 2014-04-04 14:03 UTC (permalink / raw)
  To: buildroot

Systemd build system now uses the `--relative` option from `ln(1)`.
This option was added to GNU coreutils 8.16, which is not widely
deployed yet by GNU/Linux distributions (not available in Debian Wheezy
for example).

Fixes: http://autobuild.buildroot.net/results/354/3546c003a8fcbb36ef5ba29c00a96e473b927ecb/

Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
---
 ...uild-sys-revert-use-of-ln-relative-option.patch |  115 ++++++++++++++++++++
 1 file changed, 115 insertions(+)
 create mode 100644 package/systemd/systemd-02-build-sys-revert-use-of-ln-relative-option.patch

diff --git a/package/systemd/systemd-02-build-sys-revert-use-of-ln-relative-option.patch b/package/systemd/systemd-02-build-sys-revert-use-of-ln-relative-option.patch
new file mode 100644
index 0000000..003d380
--- /dev/null
+++ b/package/systemd/systemd-02-build-sys-revert-use-of-ln-relative-option.patch
@@ -0,0 +1,115 @@
+From a371e13f4400700d28c1a96767b3b28b0807bb1f Mon Sep 17 00:00:00 2001
+From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
+Date: Fri, 4 Apr 2014 11:13:23 +0200
+Subject: [PATCH] build-sys: revert use of ln relative option.
+
+Systemd build system now uses the `--relative` option from `ln(1)`.
+This option was added to GNU coreutils 8.16, which is not widely
+deployed yet by GNU/Linux distributions (not available in Debian Wheezy
+for example).
+
+This patch reverts the following commits:
+
+- "build-sys: Fix move-to-rootlibdir"
+- "build-sys: work around broken ln --relative -s -f"
+- "build-sys: prefer using ln --relative -s where appropriate"
+
+Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
+---
+ Makefile.am |   30 ++++++++----------------------
+ 1 file changed, 8 insertions(+), 22 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 3d9e5c1..acb25c4 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -208,8 +208,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
+@@ -233,6 +233,7 @@ USER_BUSNAMES_TARGET_WANTS =
+ 
+ SYSTEM_UNIT_ALIASES =
+ USER_UNIT_ALIASES =
++
+ GENERAL_ALIASES =
+ 
+ install-target-wants-hook:
+@@ -268,9 +269,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 \
+@@ -281,15 +282,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 \
+@@ -312,10 +304,6 @@ AM_V_LN = $(AM_V_LN_$(V))
+ AM_V_LN_ = $(AM_V_LN_$(AM_DEFAULT_VERBOSITY))
+ AM_V_LN_0 = @echo "  LN      " $@;
+ 
+-AM_V_RM = $(AM_V_RM_$(V))
+-AM_V_RM_ = $(AM_V_RM_$(AM_DEFAULT_VERBOSITY))
+-AM_V_RM_0 = @echo "  RM      " $@;
+-
+ # ------------------------------------------------------------------------------
+ rootbin_PROGRAMS = \
+ 	systemctl \
+@@ -1884,8 +1872,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
+@@ -2017,8 +2004,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
+@@ -4959,7 +4945,7 @@ GENERAL_ALIASES += \
+ 	$(systemunitdir)/remote-fs.target $(pkgsysconfdir)/system/multi-user.target.wants/remote-fs.target \
+ 	$(systemunitdir)/getty at .service $(pkgsysconfdir)/system/getty.target.wants/getty at tty1.service \
+ 	$(pkgsysconfdir)/user $(sysconfdir)/xdg/systemd/user \
+-	$(dbussystemservicedir)/org.freedesktop.systemd1.service $(dbussessionservicedir)/org.freedesktop.systemd1.service
++	../system-services/org.freedesktop.systemd1.service $(dbussessionservicedir)/org.freedesktop.systemd1.service
+ 
+ if HAVE_SYSV_COMPAT
+ INSTALL_DIRS += \
+-- 
+1.7.9.5
+
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 2+ messages in thread
* [Buildroot] [PATCH] systemd: revert use of ln relative option.
  2014-04-04 14:03 [Buildroot] [PATCH] systemd: revert use of ln relative option Eric Le Bihan
@ 2014-04-04 21:34 ` Thomas Petazzoni
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni @ 2014-04-04 21:34 UTC (permalink / raw)
  To: buildroot

Dear Eric Le Bihan,

On Fri,  4 Apr 2014 16:03:34 +0200, Eric Le Bihan wrote:
> Systemd build system now uses the `--relative` option from `ln(1)`.
> This option was added to GNU coreutils 8.16, which is not widely
> deployed yet by GNU/Linux distributions (not available in Debian Wheezy
> for example).
> 
> Fixes: http://autobuild.buildroot.net/results/354/3546c003a8fcbb36ef5ba29c00a96e473b927ecb/
> 
> Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
> ---
>  ...uild-sys-revert-use-of-ln-relative-option.patch |  115 ++++++++++++++++++++
>  1 file changed, 115 insertions(+)
>  create mode 100644 package/systemd/systemd-02-build-sys-revert-use-of-ln-relative-option.patch

Applied, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-04-04 21:34 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-04-04 14:03 [Buildroot] [PATCH] systemd: revert use of ln relative option Eric Le Bihan
2014-04-04 21:34 ` Thomas Petazzoni

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.