From abb765b7a94a63a5c7d1243cf07d130edd5700931f2cd66d557b6b95add31234 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Fri, 4 Oct 2024 12:09:21 +0000 Subject: [PATCH] - Fix busybox.config again (got broken with 1.37.0 update) - Cleanup spec file OBS-URL: https://build.opensuse.org/package/show/Base:System/busybox?expand=0&rev=130 --- busybox.changes | 6 ++++++ busybox.config | 17 ++++++++--------- busybox.spec | 47 ++++++++++++++++++++++------------------------- 3 files changed, 36 insertions(+), 34 deletions(-) diff --git a/busybox.changes b/busybox.changes index c0cdd14..1a06141 100644 --- a/busybox.changes +++ b/busybox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Oct 4 11:55:30 UTC 2024 - Thorsten Kukuk + +- Fix busybox.config again (got broken with 1.37.0 update) +- Cleanup spec file + ------------------------------------------------------------------- Sat Sep 28 20:48:01 UTC 2024 - Matthias G. Eckermann diff --git a/busybox.config b/busybox.config index e4f3e5c..dceb7c5 100644 --- a/busybox.config +++ b/busybox.config @@ -1,7 +1,6 @@ # # Automatically generated make config: don't edit # Busybox version: 1.37.0 -# Fri Sep 27 16:45:20 2024 # CONFIG_HAVE_DOT_CONFIG=y @@ -95,7 +94,7 @@ CONFIG_FEATURE_BUFFERS_USE_MALLOC=y CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 CONFIG_SHA1_SMALL=1 -CONFIG_SHA1_HWACCEL=n +CONFIG_SHA1_HWACCEL=y CONFIG_SHA256_HWACCEL=y CONFIG_SHA3_SMALL=1 CONFIG_FEATURE_NON_POSIX_CP=y @@ -1022,11 +1021,11 @@ CONFIG_UDHCPC=y # CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set CONFIG_UDHCPC_DEFAULT_SCRIPT="" CONFIG_UDHCPC6_DEFAULT_SCRIPT="" -# CONFIG_UDHCPC6 is not set -# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set -# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set -# CONFIG_FEATURE_UDHCPC6_RFC4833 is not set -# CONFIG_FEATURE_UDHCPC6_RFC5970 is not set +CONFIG_UDHCPC6=y +CONFIG_FEATURE_UDHCPC6_RFC3646=y +CONFIG_FEATURE_UDHCPC6_RFC4704=y +CONFIG_FEATURE_UDHCPC6_RFC4833=y +CONFIG_FEATURE_UDHCPC6_RFC5970=y # # Common options for DHCP applets @@ -1035,8 +1034,8 @@ CONFIG_UDHCPC_DEFAULT_INTERFACE="" # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=0 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 -# CONFIG_FEATURE_UDHCP_RFC3397 is not set -# CONFIG_FEATURE_UDHCP_8021Q is not set +CONFIG_FEATURE_UDHCP_RFC3397=y +CONFIG_FEATURE_UDHCP_8021Q=y CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" # diff --git a/busybox.spec b/busybox.spec index 3c74e9c..f332dcc 100644 --- a/busybox.spec +++ b/busybox.spec @@ -25,10 +25,9 @@ Name: busybox Version: 1.37.0 -Release: 157.17 +Release: 0 Summary: Minimalist variant of UNIX utilities linked in a single executable License: GPL-2.0-or-later -Group: System/Base URL: https://www.busybox.net/ Source: https://busybox.net/downloads/%{name}-%{version}.tar.bz2 Source2: busybox.config @@ -48,17 +47,18 @@ Patch4: udhcp6-install-path.patch Patch5: tc-no-TCA_CBQ.patch # other patches Patch100: busybox.install.patch -Provides: useradd_or_adduser_dep BuildRequires: glibc-devel-static +BuildRequires: pkgconfig +BuildRequires: pkgconfig(libselinux) +# for test suite +BuildRequires: zip +Provides: useradd_or_adduser_dep #in SLE12 hostname is part of the net-tools package %if %{?suse_version} && %{?suse_version} <= 1315 BuildRequires: net-tools %else BuildRequires: hostname %endif -BuildRequires: pkgconfig(libselinux) -# for test suite -BuildRequires: zip %description BusyBox combines tiny versions of many common UNIX utilities into a @@ -75,7 +75,6 @@ box but need special configuration, like udhcpc, the dhcp client. %package static Summary: Static linked version of Busybox, a compact UNIX utility collection -Group: System/Base %description static BusyBox combines tiny versions of many common UNIX utilities into a @@ -83,7 +82,6 @@ single executable. %package warewulf3 Summary: Static version of Busybox - for building Warewulf3 -Group: System/Base %description warewulf3 This version of busybox is only for building Warewulf3 @@ -91,7 +89,6 @@ https://github.com/warewulf/warewulf3 %package testsuite Summary: Testsuite of busybox -Group: Development/Testing Requires: %{name} = %{version} Requires: zip @@ -100,8 +97,8 @@ Using this package you can test the busybox build on different kernels and glibc It needs to run with permission to the current directory, so either copy it away as is or run as root: -cd /usr/share/busybox/testsuite -PATH=/usr/share/busybox:$PATH SKIP_KNOWN_BUGS=1 ./runtest +cd %{_datadir}/busybox/testsuite +PATH=%{_datadir}/busybox:$PATH SKIP_KNOWN_BUGS=1 ./runtest %prep #SLE12 needs an empty line after autosetup for it to expand properly (bsc#1205420) @@ -118,31 +115,31 @@ export CC="gcc" export HOSTCC=gcc %if %{with static} cat %{SOURCE3} %{SOURCE2} > .config -make %{?_smp_mflags} -e oldconfig -make -e %{?_smp_mflags} +%make_build -e oldconfig +%make_build -e mv busybox busybox-static %endif %if 0%{with ww3} -make -e %{?_smp_mflags} clean +%make_build -e clean cat %{SOURCE7} %{SOURCE3} %{SOURCE2} > .config -make %{?_smp_mflags} -e oldconfig -make -e %{?_smp_mflags} +%make_build -e oldconfig +%make_build -e mv busybox busybox-warewulf3 -make -e busybox.links %{?_smp_mflags} +%make_build -e busybox.links mv busybox.links busybox-warewulf3.links %endif -make -e %{?_smp_mflags} clean +%make_build -e clean cp -a %{SOURCE2} .config -make %{?_smp_mflags} -e oldconfig +%make_build -e oldconfig #make -e %{?_smp_mflags} -make -e -make -e doc busybox.links %{?_smp_mflags} +%make_build -e +%make_build -e doc busybox.links %if 0%{?suse_version} >= 1550 for i in busybox.links %{?with_ww3:busybox-warewulf3.links}; do - sed -i -e 's,^/\(s\?bin\)/,/usr/\1/,' $i + sed -i -e 's,^/\(s\?bin\)/,%{_prefix}/\1/,' $i done %endif @@ -164,7 +161,7 @@ install -m 0644 busybox-warewulf3.links %{buildroot}%{_datadir}/busybox install -m 0755 busybox-warewulf3 %{buildroot}%{_bindir} %endif cp %{SOURCE2} %{buildroot}%{_datadir}/busybox/.config -ln -s %_bindir/busybox %{buildroot}%{_datadir}/busybox/busybox +ln -s %{_bindir}/busybox %{buildroot}%{_datadir}/busybox/busybox cp -a testsuite %{buildroot}%{_datadir}/busybox/testsuite %check @@ -175,13 +172,13 @@ export CC="gcc" export HOSTCC=gcc export SKIP_KNOWN_BUGS=1 export SKIP_INTERNET_TESTS=1 -make -e %{?_smp_mflags} test +%make_build -e test %files %license LICENSE %doc docs/mdev.txt %config %{_sysconfdir}/man.conf -%doc %{_mandir}/man1/busybox.1.gz +%{_mandir}/man1/busybox.1%{?ext_man} %{_bindir}/busybox %{_bindir}/busybox.install %dir %{_datadir}/busybox