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
This commit is contained in:
Ihno Krumreich 2018-01-16 12:41:30 +00:00 committed by Git OBS Bridge
parent 39b222541e
commit 4830614a55
5 changed files with 16 additions and 3 deletions

View File

@ -47,7 +47,7 @@ CONFIG_FEATURE_SUID=y
# CONFIG_FEATURE_PREFER_APPLETS is not set # CONFIG_FEATURE_PREFER_APPLETS is not set
CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
CONFIG_FEATURE_SYSLOG=y CONFIG_FEATURE_SYSLOG=y
CONFIG_FEATURE_HAVE_RPC=y # CONFIG_FEATURE_HAVE_RPC is not set
# #
# Build Options # Build Options
@ -560,7 +560,7 @@ CONFIG_FEATURE_MOUNT_FAKE=y
# CONFIG_FEATURE_MOUNT_VERBOSE is not set # CONFIG_FEATURE_MOUNT_VERBOSE is not set
CONFIG_FEATURE_MOUNT_HELPERS=y CONFIG_FEATURE_MOUNT_HELPERS=y
# CONFIG_FEATURE_MOUNT_LABEL is not set # 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_CIFS=y
CONFIG_FEATURE_MOUNT_FLAGS=y CONFIG_FEATURE_MOUNT_FLAGS=y
CONFIG_FEATURE_MOUNT_FSTAB=y CONFIG_FEATURE_MOUNT_FSTAB=y

View File

@ -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 Sun Jul 2 11:27:52 UTC 2017 - astieger@suse.com

View File

@ -61,6 +61,7 @@ CONFIG_FEATURE_HAVE_RPC=y
CONFIG_LFS=y CONFIG_LFS=y
CONFIG_CROSS_COMPILER_PREFIX="" CONFIG_CROSS_COMPILER_PREFIX=""
CONFIG_EXTRA_CFLAGS="" CONFIG_EXTRA_CFLAGS=""
CONFIG_EXTRA_LDLIBS="-ltirpc"
# #
# Debugging Options # Debugging Options

View File

@ -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 Sun Jul 2 11:27:52 UTC 2017 - astieger@suse.com

View File

@ -30,6 +30,7 @@ Source2: busybox.SuSE.config
Patch100: busybox.install.patch Patch100: busybox.install.patch
Patch101: %{name}-1.18.3-libarchive.patch Patch101: %{name}-1.18.3-libarchive.patch
Patch103: busybox-resource.patch Patch103: busybox-resource.patch
BuildRequires: libtirpc-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -59,7 +60,7 @@ find -name .gitignore | xargs rm -rf
export KCONFIG_NOTIMESTAMP=KCONFIG_NOTIMESTAMP export KCONFIG_NOTIMESTAMP=KCONFIG_NOTIMESTAMP
export VERBOSE=-v export VERBOSE=-v
export BUILD_VERBOSE=2 export BUILD_VERBOSE=2
export CFLAGS="%{optflags} -fno-strict-aliasing" export CFLAGS="%{optflags} -fno-strict-aliasing -I/usr/include/tirpc"
export CC="gcc" export CC="gcc"
export HOSTCC=gcc export HOSTCC=gcc
make %{?_smp_mflags} -e oldconfig make %{?_smp_mflags} -e oldconfig