* [Buildroot] [PATCH 1/5] package/coreutils: introduce a host variant
2019-12-18 20:39 [Buildroot] [PATCH 0/5] package: add host-coreutils (branch yem/host-coreutils) Yann E. MORIN
@ 2019-12-18 20:39 ` Yann E. MORIN
2019-12-18 20:39 ` [Buildroot] [PATCH 2/5] core/dependencies: check if we need to build our own host-coreutils Yann E. MORIN
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Yann E. MORIN @ 2019-12-18 20:39 UTC (permalink / raw)
To: buildroot
More and more packages are now depending on ln --relative, some require
realpath, both of which only got introduced in "recent" versions of
coreutils; older distros had a separate realpath, though, but that is
not in the list of our required dependencies, and was not installed by
default.
So, we introduce a minimal host variant of coreutils to provide those
programs.
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
package/coreutils/coreutils.mk | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk
index d312197e7e..a8137d1687 100644
--- a/package/coreutils/coreutils.mk
+++ b/package/coreutils/coreutils.mk
@@ -148,4 +148,18 @@ endef
endif
COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_FIX_CHROOT_LOCATION
+# Explicitly install ln and realpath, which we *are* insterested in.
+# A lot of other programs still get installed, however, but disabling
+# them does not gain much at build time, and is a loooong list that is
+# difficult to maintain...
+HOST_COREUTILS_CONF_OPTS = \
+ --disable-acl \
+ --disable-libcap \
+ --disable-rpath \
+ --disable-single-binary \
+ --disable-xattr \
+ --without-gmp \
+ --enable-install-program=ln,realpath
+
$(eval $(autotools-package))
+$(eval $(host-autotools-package))
--
2.20.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Buildroot] [PATCH 2/5] core/dependencies: check if we need to build our own host-coreutils
2019-12-18 20:39 [Buildroot] [PATCH 0/5] package: add host-coreutils (branch yem/host-coreutils) Yann E. MORIN
2019-12-18 20:39 ` [Buildroot] [PATCH 1/5] package/coreutils: introduce a host variant Yann E. MORIN
@ 2019-12-18 20:39 ` Yann E. MORIN
2019-12-18 20:39 ` [Buildroot] [PATCH 3/5] package/systemd: add dependency on host-coreutils Yann E. MORIN
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Yann E. MORIN @ 2019-12-18 20:39 UTC (permalink / raw)
To: buildroot
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
---
support/dependencies/check-host-coreutils.mk | 6 ++++++
support/dependencies/check-host-coreutils.sh | 12 ++++++++++++
2 files changed, 18 insertions(+)
create mode 100644 support/dependencies/check-host-coreutils.mk
create mode 100755 support/dependencies/check-host-coreutils.sh
diff --git a/support/dependencies/check-host-coreutils.mk b/support/dependencies/check-host-coreutils.mk
new file mode 100644
index 0000000000..87a3f446ea
--- /dev/null
+++ b/support/dependencies/check-host-coreutils.mk
@@ -0,0 +1,6 @@
+# Check whether the host's coreutils are up to date enough
+# to provide 'ln --relative' and 'realpath'.
+
+ifeq (,$(call suitable-host-package,coreutils))
+BR2_COREUTILS_HOST_DEPENDENCY = host-coreutils
+endif
diff --git a/support/dependencies/check-host-coreutils.sh b/support/dependencies/check-host-coreutils.sh
new file mode 100755
index 0000000000..4d36d74933
--- /dev/null
+++ b/support/dependencies/check-host-coreutils.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# Exit on the first error
+set -e
+
+# Does ln supports the --relative/-r option?
+ln --relative --help >/dev/null 2>&1
+
+# Does realpath exist?
+realpath --help >/dev/null 2>&1
+
+echo OK
--
2.20.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Buildroot] [PATCH 3/5] package/systemd: add dependency on host-coreutils
2019-12-18 20:39 [Buildroot] [PATCH 0/5] package: add host-coreutils (branch yem/host-coreutils) Yann E. MORIN
2019-12-18 20:39 ` [Buildroot] [PATCH 1/5] package/coreutils: introduce a host variant Yann E. MORIN
2019-12-18 20:39 ` [Buildroot] [PATCH 2/5] core/dependencies: check if we need to build our own host-coreutils Yann E. MORIN
@ 2019-12-18 20:39 ` Yann E. MORIN
2019-12-18 20:39 ` [Buildroot] [PATCH 4/5] package/libselinux: add dependency on host-coreutils for ln --relative Yann E. MORIN
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Yann E. MORIN @ 2019-12-18 20:39 UTC (permalink / raw)
To: buildroot
This is needed as systemd has gained a dependency on realpath(1) which
was introduced in coreutils too recently for our supported distro to
have it (Ubuntu 14.04 does not have it from coreutils, although there is
a dedicated package for it).
This also means that we now have a ln that understands --relative, so we
can drop our workaround, that upstream said they would never accept
anyway [0].
[0] https://github.com/systemd/systemd/pull/5682
Fixes:
http://autobuild.buildroot.org/results/a9a/a9a285e482285d062892bab0d1a2e2f89928c92d/
http://autobuild.buildroot.org/results/6f5/6f5b1065859d866af6fa719f611c3ea7f4b88760/
...
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Adam Duskett <aduskett@gmail.com>
Cc: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
---
.../0001-install-don-t-use-ln-relative.patch | 80 -------------------
package/systemd/systemd.mk | 2 +
2 files changed, 2 insertions(+), 80 deletions(-)
delete mode 100644 package/systemd/0001-install-don-t-use-ln-relative.patch
diff --git a/package/systemd/0001-install-don-t-use-ln-relative.patch b/package/systemd/0001-install-don-t-use-ln-relative.patch
deleted file mode 100644
index 9201724da1..0000000000
--- a/package/systemd/0001-install-don-t-use-ln-relative.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 006b1d65fd5ea6555fcb72054ecc20234f4175db Mon Sep 17 00:00:00 2001
-From: Adam Duskett <aduskett@gmail.com>
-Date: Sun, 31 Dec 2017 12:46:04 -0500
-Subject: [PATCH] install: don't use ln --relative
-
-Oldish enterprise-class distributions have too old versions of
-coreutils, with ln not supporting --relative.
-
-So we fake it.
-
-ln --relative would create minimalist relative paths, but they are not
-trivial to generate. Instead, we always create paths relative to the
-root, i.e.:
-
- ln -s --relative /usr/bin/foo /usr/sbin/foo
-
-would create: /usr/sbin/foo -> ../bin/foo
-while we do : /usr/sbin/foo -> ../../usr/bin/foo
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-[aduskett at gmail.com: Added meson.build section and dirname wrapper in add-wants]
-[aduskett at gmail.com: Update for systemd v237]
-Signed-off-by: Adam Duskett <aduskett@gmail.com>
-[tpiepho at impinj.com: Fix add-wants wrapper]
-Signed-off-by: Trent Piepho <tpiepho@impinj.com>
----
- meson.build | 2 +-
- tools/meson-make-symlink.sh | 3 ++-
- units/meson-add-wants.sh | 6 ++++--
- 3 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index e5ceb1e169..9d3c746da4 100644
---- a/meson.build
-+++ b/meson.build
-@@ -591,7 +591,7 @@ endforeach
- conf.set_quoted('TELINIT', get_option('telinit-path'))
-
- if run_command('ln', '--relative', '--help').returncode() != 0
-- error('ln does not support --relative (added in coreutils 8.16)')
-+ message('ln does not support --relative (added in coreutils 8.16)')
- endif
-
- ############################################################
-diff --git a/tools/meson-make-symlink.sh b/tools/meson-make-symlink.sh
-index da0d13a341..4917eff7d1 100755
---- a/tools/meson-make-symlink.sh
-+++ b/tools/meson-make-symlink.sh
-@@ -8,5 +8,6 @@ mkdir -vp "$(dirname "${DESTDIR:-}$2")"
- if [ "$(dirname $1)" = . ]; then
- ln -vfs -T "$1" "${DESTDIR:-}$2"
- else
-- ln -vfs -T --relative "${DESTDIR:-}$1" "${DESTDIR:-}$2"
-+ dds="$( dirname "$2" |sed -r -e 's:/+[^/]+:../:g; s:/$::' )"
-+ ln -vfs -T "${dds}$1" "${DESTDIR:-}$2"
- fi
-diff --git a/units/meson-add-wants.sh b/units/meson-add-wants.sh
-index a483d75b86..4642673d98 100755
---- a/units/meson-add-wants.sh
-+++ b/units/meson-add-wants.sh
-@@ -14,7 +14,7 @@ case "$target" in
- ;;
- esac
-
--unitpath="${DESTDIR:-}${unitdir}/${unit}"
-+unitpath="${unitdir}/${unit}"
-
- case "$target" in
- */)
-@@ -25,4 +25,6 @@ case "$target" in
- ;;
- esac
-
--ln -vfs --relative "$unitpath" "$dir"
-+[ ! -d "${dir}" ] && linkdir=`dirname "${dir}"` || linkdir="${dir}"
-+dds="$(printf "%s" "${linkdir#${DESTDIR:-}}" |sed -r -e 's:/+[^/]+:../:g; s:/$::')"
-+ln -vfs "$dds$unitpath" "$dir"
---
-2.20.1
-
diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk
index cfe4e2a108..3c44b039b5 100644
--- a/package/systemd/systemd.mk
+++ b/package/systemd/systemd.mk
@@ -10,6 +10,7 @@ SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, s
SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README tools/chromiumos/LICENSE
SYSTEMD_INSTALL_STAGING = YES
SYSTEMD_DEPENDENCIES = \
+ $(BR2_COREUTILS_HOST_DEPENDENCY) \
$(if $(BR2_PACKAGE_BASH_COMPLETION),bash-completion) \
host-gperf \
kmod \
@@ -553,6 +554,7 @@ HOST_SYSTEMD_CONF_OPTS = \
-Dsysvinit-path=''
HOST_SYSTEMD_DEPENDENCIES = \
+ $(BR2_COREUTILS_HOST_DEPENDENCY) \
host-util-linux \
host-patchelf \
host-libcap \
--
2.20.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Buildroot] [PATCH 4/5] package/libselinux: add dependency on host-coreutils for ln --relative
2019-12-18 20:39 [Buildroot] [PATCH 0/5] package: add host-coreutils (branch yem/host-coreutils) Yann E. MORIN
` (2 preceding siblings ...)
2019-12-18 20:39 ` [Buildroot] [PATCH 3/5] package/systemd: add dependency on host-coreutils Yann E. MORIN
@ 2019-12-18 20:39 ` Yann E. MORIN
2019-12-18 20:39 ` [Buildroot] [PATCH 5/5] package/libsepol: " Yann E. MORIN
2020-01-06 20:47 ` [Buildroot] [PATCH 0/5] package: add host-coreutils (branch yem/host-coreutils) Thomas Petazzoni
5 siblings, 0 replies; 7+ messages in thread
From: Yann E. MORIN @ 2019-12-18 20:39 UTC (permalink / raw)
To: buildroot
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Adam Duskett <aduskett@gmail.com>
Cc: Clayton Shotwell <clayton.shotwell@rockwellcollins.com>
Cc: Matt Weber <matthew.weber@rockwellcollins.com>
Cc: Marcus Folkesson <marcus.folkesson@gmail.com>
---
.../libselinux/0002-revert-ln-relative.patch | 26 ------------------
...-ln-relative-usage-in-install-pywrap.patch | 27 -------------------
package/libselinux/libselinux.mk | 2 +-
3 files changed, 1 insertion(+), 54 deletions(-)
delete mode 100644 package/libselinux/0002-revert-ln-relative.patch
delete mode 100644 package/libselinux/0005-Remove-ln-relative-usage-in-install-pywrap.patch
diff --git a/package/libselinux/0002-revert-ln-relative.patch b/package/libselinux/0002-revert-ln-relative.patch
deleted file mode 100644
index f7beab2697..0000000000
--- a/package/libselinux/0002-revert-ln-relative.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Makefile: revert libselinux: use ln --relative to create .so symlinks
-
-This reverts 71393a181d63c9baae5fe8dcaeb9411d1f253998
-
-ln --relative is too recent to be available in all distributions,
-especially enterprise-grade distros that can stick around as long as
-they are maintained (up to 10 years in some cases?).
-
-For the sake of Buildroot, revert the upstream patch.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Update for 2.8 (with assumption that SHLIBDIR=LIBDIR)]
-
-diff -durNw libselinux-2.7.orig/src/Makefile libselinux-2.7/src/Makefile
---- libselinux-2.7.orig/src/Makefile 2018-01-15 20:53:50.168525700 +0100
-+++ libselinux-2.7/src/Makefile 2018-01-15 20:55:27.061858005 +0100
-@@ -181,7 +181,7 @@
- install -m 755 $(LIBSO) $(DESTDIR)$(SHLIBDIR)
- test -d $(DESTDIR)$(LIBDIR)/pkgconfig || install -m 755 -d $(DESTDIR)$(LIBDIR)/pkgconfig
- install -m 644 $(LIBPC) $(DESTDIR)$(LIBDIR)/pkgconfig
-- ln -sf --relative $(DESTDIR)$(SHLIBDIR)/$(LIBSO) $(DESTDIR)$(LIBDIR)/$(TARGET)
-+ cd $(DESTDIR)$(LIBDIR) && ln -sf $(LIBSO) $(TARGET)
-
- install-pywrap: pywrap
- test -d $(DESTDIR)$(PYTHONLIBDIR)/selinux || install -m 755 -d $(DESTDIR)$(PYTHONLIBDIR)/selinux
diff --git a/package/libselinux/0005-Remove-ln-relative-usage-in-install-pywrap.patch b/package/libselinux/0005-Remove-ln-relative-usage-in-install-pywrap.patch
deleted file mode 100644
index bf482af68a..0000000000
--- a/package/libselinux/0005-Remove-ln-relative-usage-in-install-pywrap.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From af2284b8510161e8742787a632ebb2aaef8fc045 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Date: Fri, 25 Oct 2019 13:36:29 +0200
-Subject: [PATCH] Remove ln --relative usage in install-pywrap
-
-[Upstream: https://github.com/SELinuxProject/selinux/pull/184]
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
----
- src/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index 2b1696a0..799df2b0 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -175,7 +175,7 @@ install: all
- install-pywrap: pywrap
- $(PYTHON) setup.py install --prefix=$(PREFIX) `test -n "$(DESTDIR)" && echo --root $(DESTDIR)`
- install -m 644 $(SWIGPYOUT) $(DESTDIR)$(PYTHONLIBDIR)/selinux/__init__.py
-- ln -sf --relative $(DESTDIR)$(PYTHONLIBDIR)/selinux/_selinux$(PYCEXT) $(DESTDIR)$(PYTHONLIBDIR)/_selinux$(PYCEXT)
-+ cd $(DESTDIR)$(PYTHONLIBDIR) && ln -sf selinux/_selinux$(PYCEXT) _selinux$(PYCEXT)
-
- install-rubywrap: rubywrap
- test -d $(DESTDIR)$(RUBYINSTALL) || install -m 755 -d $(DESTDIR)$(RUBYINSTALL)
---
-2.21.0
-
diff --git a/package/libselinux/libselinux.mk b/package/libselinux/libselinux.mk
index b8ef4f5fba..1461e34539 100644
--- a/package/libselinux/libselinux.mk
+++ b/package/libselinux/libselinux.mk
@@ -9,7 +9,7 @@ LIBSELINUX_SITE = https://github.com/SELinuxProject/selinux/releases/download/20
LIBSELINUX_LICENSE = Public Domain
LIBSELINUX_LICENSE_FILES = LICENSE
-LIBSELINUX_DEPENDENCIES = libsepol pcre
+LIBSELINUX_DEPENDENCIES = $(BR2_COREUTILS_HOST_DEPENDENCY) libsepol pcre
LIBSELINUX_INSTALL_STAGING = YES
--
2.20.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Buildroot] [PATCH 5/5] package/libsepol: add dependency on host-coreutils for ln --relative
2019-12-18 20:39 [Buildroot] [PATCH 0/5] package: add host-coreutils (branch yem/host-coreutils) Yann E. MORIN
` (3 preceding siblings ...)
2019-12-18 20:39 ` [Buildroot] [PATCH 4/5] package/libselinux: add dependency on host-coreutils for ln --relative Yann E. MORIN
@ 2019-12-18 20:39 ` Yann E. MORIN
2020-01-06 20:47 ` [Buildroot] [PATCH 0/5] package: add host-coreutils (branch yem/host-coreutils) Thomas Petazzoni
5 siblings, 0 replies; 7+ messages in thread
From: Yann E. MORIN @ 2019-12-18 20:39 UTC (permalink / raw)
To: buildroot
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Adam Duskett <aduskett@gmail.com>
Cc: Clayton Shotwell <clayton.shotwell@rockwellcollins.com>
Cc: Matt Weber <matthew.weber@rockwellcollins.com>
Cc: Marcus Folkesson <marcus.folkesson@gmail.com>
---
.../libsepol/0002-revert-ln-relative.patch | 29 -------------------
package/libsepol/libsepol.mk | 2 +-
2 files changed, 1 insertion(+), 30 deletions(-)
delete mode 100644 package/libsepol/0002-revert-ln-relative.patch
diff --git a/package/libsepol/0002-revert-ln-relative.patch b/package/libsepol/0002-revert-ln-relative.patch
deleted file mode 100644
index 40dabc38de..0000000000
--- a/package/libsepol/0002-revert-ln-relative.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 16b2b0e21e10727065042a1baabd1a887757c65c Mon Sep 17 00:00:00 2001
-From: Adam Duskett <aduskett@gmail.com>
-Date: Mon, 9 Oct 2017 16:29:36 -0400
-Subject: [PATCH] Makefile: revert libsepol: use ln --relative to create .so symlinks
-
-This reverts 71393a181d63c9baae5fe8dcaeb9411d1f253998
-
-ln --relative is too recent to be available in all distributions,
-especially enterprise-grade distros that can stick around as long as
-they are maintained (up to 10 years in some cases?).
-
-For the sake of Buildroot, revert the upstream patch.
-
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Update for 2.8 (with assumption that SHLIBDIR=LIBDIR)]
-
-diff -durNw libsepol-2.7.orig/src/Makefile libsepol-2.7/src/Makefile
---- libsepol-2.7.orig/src/Makefile 2018-01-15 21:37:12.821831315 +0100
-+++ libsepol-2.7/src/Makefile 2018-01-15 21:38:03.838497434 +0100
-@@ -92,7 +92,7 @@
- endif
- test -d $(DESTDIR)$(LIBDIR)/pkgconfig || install -m 755 -d $(DESTDIR)$(LIBDIR)/pkgconfig
- install -m 644 $(LIBPC) $(DESTDIR)$(LIBDIR)/pkgconfig
-- $(LN) -sf --relative $(DESTDIR)$(SHLIBDIR)/$(LIBSO) $(DESTDIR)$(LIBDIR)/$(TARGET)
-+ cd $(DESTDIR)$(LIBDIR) && ln -sf $(LIBSO) $(TARGET)
-
- relabel:
- /sbin/restorecon $(LIBINSTALL)/$(LIBSO)
diff --git a/package/libsepol/libsepol.mk b/package/libsepol/libsepol.mk
index 58b9b9c374..62b0744aa3 100644
--- a/package/libsepol/libsepol.mk
+++ b/package/libsepol/libsepol.mk
@@ -11,7 +11,7 @@ LIBSEPOL_LICENSE_FILES = COPYING
LIBSEPOL_INSTALL_STAGING = YES
LIBSEPOL_DEPENDENCIES = host-flex
-HOST_LIBSEPOL_DEPENDENCIES = host-flex
+HOST_LIBSEPOL_DEPENDENCIES = $(BR2_COREUTILS_HOST_DEPENDENCY) host-flex
LIBSEPOL_MAKE_FLAGS = $(TARGET_CONFIGURE_OPTS)
--
2.20.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Buildroot] [PATCH 0/5] package: add host-coreutils (branch yem/host-coreutils)
2019-12-18 20:39 [Buildroot] [PATCH 0/5] package: add host-coreutils (branch yem/host-coreutils) Yann E. MORIN
` (4 preceding siblings ...)
2019-12-18 20:39 ` [Buildroot] [PATCH 5/5] package/libsepol: " Yann E. MORIN
@ 2020-01-06 20:47 ` Thomas Petazzoni
5 siblings, 0 replies; 7+ messages in thread
From: Thomas Petazzoni @ 2020-01-06 20:47 UTC (permalink / raw)
To: buildroot
Hello,
On Wed, 18 Dec 2019 21:39:04 +0100
"Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
> Yann E. MORIN (5):
> package/coreutils: introduce a host variant
> core/dependencies: check if we need to build our own host-coreutils
> package/systemd: add dependency on host-coreutils
> package/libselinux: add dependency on host-coreutils for ln --relative
> package/libsepol: add dependency on host-coreutils for ln --relative
Thanks, I've applied to master!
One thing that would be nice is to check if
package/coreutils/0001-fix-for-dummy-man-usage.patch is still needed,
and if it is, what we can do about it. It's annoying to have AUTORECONF
= YES and GETTEXTIZE = YES just for this patch.
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 7+ messages in thread