From 4830614a55b3a419cce338174dbdf4d2fa2002e554efe88a37ea9229a4c3e473 Mon Sep 17 00:00:00 2001 From: Ihno Krumreich Date: Tue, 16 Jan 2018 12:41:30 +0000 Subject: [PATCH] Accepting request 540624 from home:kukuk:no-sunrpc - Disable RPC/NFS, we don't have a static libtirpc - Build against libtirpc in preparation of deprecating sunrpc from glibc OBS-URL: https://build.opensuse.org/request/show/540624 OBS-URL: https://build.opensuse.org/package/show/Base:System/busybox?expand=0&rev=45 --- busybox-static.SuSE.config | 4 ++-- busybox-static.changes | 5 +++++ busybox.SuSE.config | 1 + busybox.changes | 6 ++++++ busybox.spec | 3 ++- 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/busybox-static.SuSE.config b/busybox-static.SuSE.config index b93232d..4fbb0ac 100644 --- a/busybox-static.SuSE.config +++ b/busybox-static.SuSE.config @@ -47,7 +47,7 @@ CONFIG_FEATURE_SUID=y # CONFIG_FEATURE_PREFER_APPLETS is not set CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" CONFIG_FEATURE_SYSLOG=y -CONFIG_FEATURE_HAVE_RPC=y +# CONFIG_FEATURE_HAVE_RPC is not set # # Build Options @@ -560,7 +560,7 @@ CONFIG_FEATURE_MOUNT_FAKE=y # CONFIG_FEATURE_MOUNT_VERBOSE is not set CONFIG_FEATURE_MOUNT_HELPERS=y # CONFIG_FEATURE_MOUNT_LABEL is not set -CONFIG_FEATURE_MOUNT_NFS=y +# CONFIG_FEATURE_MOUNT_NFS is not set CONFIG_FEATURE_MOUNT_CIFS=y CONFIG_FEATURE_MOUNT_FLAGS=y CONFIG_FEATURE_MOUNT_FSTAB=y diff --git a/busybox-static.changes b/busybox-static.changes index 7abb4f0..6e109f8 100644 --- a/busybox-static.changes +++ b/busybox-static.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 10 18:36:03 CET 2017 - kukuk@suse.de + +- Disable RPC/NFS, we don't have a static libtirpc + ------------------------------------------------------------------- Sun Jul 2 11:27:52 UTC 2017 - astieger@suse.com diff --git a/busybox.SuSE.config b/busybox.SuSE.config index 98abe6e..1e1c07f 100644 --- a/busybox.SuSE.config +++ b/busybox.SuSE.config @@ -61,6 +61,7 @@ CONFIG_FEATURE_HAVE_RPC=y CONFIG_LFS=y CONFIG_CROSS_COMPILER_PREFIX="" CONFIG_EXTRA_CFLAGS="" +CONFIG_EXTRA_LDLIBS="-ltirpc" # # Debugging Options diff --git a/busybox.changes b/busybox.changes index 390deb7..c585e54 100644 --- a/busybox.changes +++ b/busybox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Nov 10 16:16:48 CET 2017 - kukuk@suse.de + +- Build against libtirpc in preparation of deprecating sunrpc from + glibc + ------------------------------------------------------------------- Sun Jul 2 11:27:52 UTC 2017 - astieger@suse.com diff --git a/busybox.spec b/busybox.spec index 7351c12..b1ba033 100644 --- a/busybox.spec +++ b/busybox.spec @@ -30,6 +30,7 @@ Source2: busybox.SuSE.config Patch100: busybox.install.patch Patch101: %{name}-1.18.3-libarchive.patch Patch103: busybox-resource.patch +BuildRequires: libtirpc-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -59,7 +60,7 @@ find -name .gitignore | xargs rm -rf export KCONFIG_NOTIMESTAMP=KCONFIG_NOTIMESTAMP export VERBOSE=-v export BUILD_VERBOSE=2 -export CFLAGS="%{optflags} -fno-strict-aliasing" +export CFLAGS="%{optflags} -fno-strict-aliasing -I/usr/include/tirpc" export CC="gcc" export HOSTCC=gcc make %{?_smp_mflags} -e oldconfig