Sync from SUSE:SLFO:1.1 busybox-links revision 5928db82f5966dfe2f71d3d3d5b97374

busybox-links.changes

@@ -1,21 +1,3 @@
--------------------------------------------------------------------
-Fri Oct  4 08:39:05 UTC 2024 - Thorsten Kukuk <kukuk@suse.com>
-
-- Partly revert changes from Aug 8th 2023 to automatically detect
-  changes in busybox configuration
-- Add getfattr applet to attr filelist
-
--------------------------------------------------------------------
-Thu Oct  3 14:00:49 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- BuildRequire busybox: as we want to track the version of busybox,
-  we need to ensure busybox is part of the buildroot.
-
--------------------------------------------------------------------
-Wed Feb 21 16:40:24 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- busybox-udhcpc conflicts with udhcp.
-
 -------------------------------------------------------------------
 Fri Dec  8 14:12:35 UTC 2023 - Thorsten Kukuk <kukuk@suse.com>
 

busybox-links.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package busybox-links
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -85,7 +85,6 @@ Source58:       filelist-udhcpc.txt
 # out ouf WORKDIR into the package directory
 Source98:       create-filelists.sh
 Source99:       Dockerfile
-BuildRequires:  busybox
 Requires:       busybox = %{version}
 Requires:       busybox-adduser = %{version}
 Requires:       busybox-attr = %{version}
@@ -175,7 +174,7 @@ This package contains the symlinks to replace attr with busybox.
 Summary:        Busybox sh, ash and hush
 Requires:       busybox = %{version}
 Requires(post): busybox
-Requires(preun): busybox
+Requires(preun):busybox
 Provides:       alternative(sh)
 Conflicts:      alternative(sh)
 Obsoletes:      busybox-ash < %{version}
@@ -598,7 +597,6 @@ This package contains the symlinks to provide policycoreutils with busybox.
 %package -n busybox-udhcpc
 Summary:        Busybox applets providing udhcp client
 Requires:       busybox = %{version}
-Conflicts:      udhcp
 
 %description -n busybox-udhcpc
 This package contains the symlinks to provide the udhcp clients with busybox.
@@ -612,17 +610,15 @@ cp %{_sourcedir}/filelist*.txt .
 %build
 %if 0%{?suse_version} < 1550
 echo "/bin/sh" >> filelist-sh.txt
+echo -e "/sbin/loadkmap" >> filelist-kbd.txt
 %endif
 
+cat filelist-*.txt | sort -u > filelist.txt
+
 %install
+mkdir -p %{buildroot}%{_bindir}
 bash %{_sourcedir}/busybox.install %{buildroot} --symlinks
-rm %{buildroot}/bin/busybox %{buildroot}%{_bindir}/[[
-# Move files to correct directories
-mv %{buildroot}%{_sbindir}/{arping,chroot,ifconfig,route,setfont,setlogcons} %{buildroot}%{_bindir}/
-mv %{buildroot}%{_bindir}/{traceroute,traceroute6} %{buildroot}%{_sbindir}/
-ln -sf %{_sbindir}/lsmod %{buildroot}%{_bindir}/lsmod
-ln -sf %{_sbindir}/ip %{buildroot}%{_bindir}/ip
-ln -sf %{_sbindir}/sestatus %{buildroot}%{_bindir}/sestatus
+rm %{buildroot}%{_bindir}/busybox
 ln -sf %{_bindir}/busybox %{buildroot}%{_bindir}/sh
 %if 0%{?suse_version} < 1550
 ln -sf %{_bindir}/sh   %{buildroot}/bin/sh

busybox.install

@@ -15,7 +15,7 @@ shift # Keep only remaining options
 # Source the configuration
 #. ./.config
 
-h=`sort /usr/share/busybox/busybox.links | uniq`
+h=`sort filelist.txt | uniq`
 
 sharedlib_dir="0_lib"
 
@@ -60,8 +60,8 @@ if [ -n "$DO_INSTALL_LIBS" ] && [ x"$DO_INSTALL_LIBS" != x"n" ]; then
 	done
 fi
 
-if [ x"$cleanup" = x"1" ] && [ -e "$prefix/bin/busybox" ]; then
-	inode=`ls -i "$prefix/bin/busybox" | awk '{print $1}'`
+if [ x"$cleanup" = x"1" ] && [ -e "$prefix/usr/bin/busybox" ]; then
+	inode=`ls -i "$prefix/usr/bin/busybox" | awk '{print $1}'`
 	sub_shell_it=`
 		cd "$prefix"
 		for d in usr/sbin usr/bin sbin bin; do
@@ -76,9 +76,9 @@ if [ x"$cleanup" = x"1" ] && [ -e "$prefix/bin/busybox" ]; then
 	exit 0
 fi
 
-rm -f "$prefix/bin/busybox" || exit 1
+rm -f "$prefix/usr/bin/busybox" || exit 1
 mkdir -p "$prefix/bin" || exit 1
-install -m 755 /usr/bin/busybox "$prefix/bin/busybox" || exit 1
+install -m 755 /usr/bin/busybox "$prefix/usr/bin/busybox" || exit 1
 
 for i in $h; do
 	appdir=`dirname "$i"`
@@ -93,7 +93,7 @@ for i in $h; do
 			ln $linkopts busybox "$prefix/$i" || exit 1
 		else
 			rm -f "$prefix/$i"
-			echo "#!/bin/busybox" >"$prefix/$i"
+			echo "../usr/bin/busybox" >"$prefix/$i"
 			chmod +x "$prefix/$i"
 		fi
 		echo "	$prefix/$i"
@@ -108,16 +108,19 @@ for i in $h; do
 		fi
 	else
 		if [ x"$linkopts" = x"-f" ]; then
-			bb_path="$prefix/bin/busybox"
+			bb_path="$prefix/usr/bin/busybox"
 		else
 			case "$appdir" in
 			/)
-				bb_path="usr/bin/busybox"
+				bb_path="../usr/bin/busybox"
 			;;
-			/bin | /usr/bin)
-				bb_path="../bin/busybox"
+			/bin)
+				bb_path="../usr/bin/busybox"
 			;;
-			/sbin | /usr/sbin)
+			/sbin)
+				bb_path="../usr/bin/busybox"
+			;;
+			/usr/bin | /usr/sbin)
 				bb_path="../bin/busybox"
 			;;
 			*)

filelist-attr.txt

@@ -1,2 +1 @@
-/usr/bin/getfattr
 /usr/bin/setfattr

filelist-kbd.txt

@@ -7,4 +7,3 @@
 /usr/bin/showkey
 /usr/bin/vlock
 /usr/sbin/loadfont
-/usr/sbin/loadkmap