Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package busybox for openSUSE:Factory checked in at 2021-10-18 22:03:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/busybox (Old) and /work/SRC/openSUSE:Factory/.busybox.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "busybox" Mon Oct 18 22:03:29 2021 rev:68 rq:925383 version:1.33.1 Changes: -------- --- /work/SRC/openSUSE:Factory/busybox/busybox.changes 2021-05-12 19:32:06.487067343 +0200 +++ /work/SRC/openSUSE:Factory/.busybox.new.1890/busybox.changes 2021-10-18 22:03:33.746153047 +0200 @@ -1,0 +2,11 @@ +Sat Oct 9 13:16:11 UTC 2021 - Egbert Eich <e...@suse.com> + +- Create separate 'Warewulf3' (https://github.com/warewulf/warewulf3) + flavor of busybox with the + additional setting: + CONFIG_REBOOT=y + CONFIG_SWITCH_ROOT=y + CONFIG_CTTYHACK=y + (bsc#1191514). + +------------------------------------------------------------------- New: ---- busybox-warewulf3.config ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ busybox.spec ++++++ --- /var/tmp/diff_new_pack.RG1DMW/_old 2021-10-18 22:03:34.426153539 +0200 +++ /var/tmp/diff_new_pack.RG1DMW/_new 2021-10-18 22:03:34.426153539 +0200 @@ -26,10 +26,13 @@ Source: https://busybox.net/downloads/%{name}-%{version}.tar.bz2 Source1: BusyBox.1 Source2: busybox.config +# Make sure busybox-static.config stays in sync with busybox.config - +# exception: SELinux commands - these do not build statically. Source3: busybox-static.config Source4: man.conf Source5: https://busybox.net/downloads/%{name}-%{version}.tar.bz2.sig Source6: https://busybox.net/~vda/vda_pubkey.gpg#/%{name}.keyring +Source7: busybox-warewulf3.config Patch0: cpio-long-opt.patch Patch1: sendmail-ignore-F-option.patch # other patches @@ -40,6 +43,10 @@ # for test suite BuildRequires: zip +%ifarch x86_64 aarch64 +%define build_ww3 1 +%endif + %description BusyBox combines tiny versions of many common UNIX utilities into a single executable. It provides minimalist replacements for utilities @@ -58,6 +65,14 @@ BusyBox combines tiny versions of many common UNIX utilities into a 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 +https://github.com/warewulf/warewulf3 + %package testsuite Summary: Testsuite of busybox Group: Development/Testing @@ -92,14 +107,28 @@ make %{?_smp_mflags} -e oldconfig make -e %{?_smp_mflags} mv busybox busybox-static + +%if 0%{?build_ww3} +make -e %{?_smp_mflags} clean +cp -a %{SOURCE7} .config +make %{?_smp_mflags} -e oldconfig +make -e %{?_smp_mflags} +mv busybox busybox-warewulf3 +make -e busybox.links %{?_smp_mflags} +mv busybox.links busybox-warewulf3.links +%endif + make -e %{?_smp_mflags} clean cp -a %{SOURCE2} .config make %{?_smp_mflags} -e oldconfig #make -e %{?_smp_mflags} make -e make -e doc busybox.links %{?_smp_mflags} + %if 0%{?usrmerged} -sed -i -e 's,^/\(s\?bin\)/,/usr/\1/,' busybox.links +for i in busybox.links %{?build_ww3:busybox-warewulf3.links}; do + sed -i -e 's,^/\(s\?bin\)/,/usr/\1/,' $i +done %endif %install @@ -113,6 +142,10 @@ install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/ install -d %{buildroot}%{_mandir}/man1 install -m 644 docs/BusyBox.1 %{buildroot}%{_mandir}/man1 +%if 0%{?build_ww3} +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 cp -a testsuite %{buildroot}%{_datadir}/busybox/testsuite @@ -146,4 +179,12 @@ %license LICENSE %{_bindir}/busybox-static +%if 0%{?build_ww3} +%files warewulf3 +%license LICENSE +%{_bindir}/busybox-warewulf3 +%dir %{_datadir}/busybox +%{_datadir}/busybox/busybox-warewulf3.links +%endif + %changelog
