Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package busybox-links for openSUSE:Factory
checked in at 2025-08-06 14:31:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/busybox-links (Old)
and /work/SRC/openSUSE:Factory/.busybox-links.new.1085 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "busybox-links"
Wed Aug 6 14:31:09 2025 rev:36 rq:1297418 version:MACRO
Changes:
--------
--- /work/SRC/openSUSE:Factory/busybox-links/busybox-links.changes
2025-07-20 15:28:51.615543653 +0200
+++ /work/SRC/openSUSE:Factory/.busybox-links.new.1085/busybox-links.changes
2025-08-06 14:31:28.623476034 +0200
@@ -1,0 +2,7 @@
+Fri Aug 1 14:57:55 UTC 2025 - Radoslav Kolev <radoslav.ko...@suse.com>
+
+- fix generation of file lists via Dockerfile
+- add copy of busybox.links from the container to catch changes
+ to busybox config
+
+-------------------------------------------------------------------
New:
----
busybox.links
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ busybox-links.spec ++++++
--- /var/tmp/diff_new_pack.OY8rx6/_old 2025-08-06 14:31:32.243627554 +0200
+++ /var/tmp/diff_new_pack.OY8rx6/_new 2025-08-06 14:31:32.243627554 +0200
@@ -81,10 +81,20 @@
Source57: filelist-xz.txt
Source58: filelist-udhcpc.txt
# used for creating the above filelists and busybox.install:
-# build the container locally and then copy filelist-*txt and busybox.install
-# out ouf WORKDIR into the package directory
+# build the container locally and then copy /rpm/filelist-*txt,
+# /rpm/busybox.install # and /usr/share/busybox/busybox.links
+# from the container into the package directory
+# I used the following commands:
+# podman build -f Dockerfile -t busybox-links-filelists"
+# podman run -it localhost/busybox-links-filelists
+# verify files look OK inside the container, then copy files
+# to the package directory
Source98: create-filelists.sh
Source99: Dockerfile
+#we include the busybox.links from the busybox package in the
+#container where the create-filelists.sh script was called
+#so we can compare as a sanity chech there are no changes
+Source100: busybox.links
BuildRequires: busybox
Requires: busybox = %{version}
Requires: busybox-adduser = %{version}
@@ -613,17 +623,13 @@
%if 0%{?suse_version} < 1550
echo "/bin/sh" >> filelist-sh.txt
%endif
+cat filelist-*.txt | sort -u > filelist.txt
+diff %{SOURCE100} %{_datadir}/busybox/busybox.links
%install
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
-ln -sf %{_bindir}/busybox %{buildroot}%{_bindir}/sh
+rm %{buildroot}%{_bindir}/busybox
+
%if 0%{?suse_version} < 1550
ln -sf %{_bindir}/sh %{buildroot}/bin/sh
%endif
++++++ Dockerfile ++++++
--- /var/tmp/diff_new_pack.OY8rx6/_old 2025-08-06 14:31:32.363632577 +0200
+++ /var/tmp/diff_new_pack.OY8rx6/_new 2025-08-06 14:31:32.367632745 +0200
@@ -5,5 +5,5 @@
COPY create-filelists.sh .
-RUN ./create-filelists.sh
+RUN bash ./create-filelists.sh
++++++ busybox.install ++++++
--- /var/tmp/diff_new_pack.OY8rx6/_old 2025-08-06 14:31:32.403634251 +0200
+++ /var/tmp/diff_new_pack.OY8rx6/_new 2025-08-06 14:31:32.407634419 +0200
@@ -15,11 +15,7 @@
# Source the configuration
#. ./.config
-#this is a placeholder, it will be replaced with correct list by
create-filelists.sh
-#when building the busybox-links package
-IGNORE_APPLETS="halt poweroff reboot"
-
-h=`sort /usr/share/busybox/busybox.links | uniq | grep -vE "${IGNORE_APPLETS//
/|}"`
+h=`sort filelist.txt | uniq`
sharedlib_dir="0_lib"
@@ -64,8 +60,8 @@
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
@@ -80,9 +76,9 @@
exit 0
fi
-rm -f "$prefix/bin/busybox" || exit 1
-mkdir -p "$prefix/bin" || exit 1
-install -m 755 /usr/bin/busybox "$prefix/bin/busybox" || exit 1
+rm -f "$prefix/usr/bin/busybox" || exit 1
+mkdir -p "$prefix/usr/bin" || exit 1
+install -m 755 /usr/bin/busybox "$prefix/usr/bin/busybox" || exit 1
for i in $h; do
appdir=`dirname "$i"`
@@ -97,7 +93,7 @@
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"
@@ -112,16 +108,19 @@
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)
+ bb_path="../usr/bin/busybox"
;;
- /sbin | /usr/sbin)
+ /usr/bin | /usr/sbin)
bb_path="../bin/busybox"
;;
*)
++++++ busybox.links ++++++
/usr/bin/ar
/usr/bin/uncompress
/usr/bin/gunzip
/usr/bin/zcat
/usr/bin/bunzip2
/usr/bin/bzcat
/usr/bin/unlzma
/usr/bin/lzcat
/usr/bin/lzma
/usr/bin/unxz
/usr/bin/xzcat
/usr/bin/xz
/usr/bin/bzip2
/usr/bin/cpio
/usr/bin/gzip
/usr/bin/lzop
/usr/bin/tar
/usr/bin/unzip
/usr/bin/chvt
/usr/bin/clear
/usr/bin/deallocvt
/usr/sbin/loadfont
/usr/sbin/setfont
/usr/sbin/loadkmap
/usr/bin/openvt
/usr/bin/reset
/usr/bin/resize
/usr/sbin/setconsole
/usr/bin/setkeycodes
/usr/sbin/setlogcons
/usr/bin/showkey
/usr/bin/basename
/usr/bin/cat
/usr/bin/chgrp
/usr/bin/chmod
/usr/bin/chown
/usr/sbin/chroot
/usr/bin/cksum
/usr/bin/comm
/usr/bin/cp
/usr/bin/cut
/usr/bin/date
/usr/bin/dd
/usr/bin/df
/usr/bin/dirname
/usr/bin/dos2unix
/usr/bin/unix2dos
/usr/bin/du
/usr/bin/echo
/usr/bin/env
/usr/bin/expand
/usr/bin/unexpand
/usr/bin/expr
/usr/bin/factor
/usr/bin/false
/usr/bin/fold
/usr/bin/head
/usr/bin/hostid
/usr/bin/groups
/usr/bin/id
/usr/bin/install
/usr/bin/link
/usr/bin/ln
/usr/bin/logname
/usr/bin/ls
/usr/bin/md5sum
/usr/bin/sha1sum
/usr/bin/sha3sum
/usr/bin/sha256sum
/usr/bin/sha512sum
/usr/bin/mkdir
/usr/bin/mkfifo
/usr/bin/mknod
/usr/bin/mktemp
/usr/bin/mv
/usr/bin/nice
/usr/bin/nl
/usr/bin/nohup
/usr/bin/nproc
/usr/bin/od
/usr/bin/paste
/usr/bin/printenv
/usr/bin/printf
/usr/bin/pwd
/usr/bin/readlink
/usr/bin/realpath
/usr/bin/rm
/usr/bin/rmdir
/usr/bin/seq
/usr/bin/shred
/usr/bin/shuf
/usr/bin/sleep
/usr/bin/sort
/usr/bin/split
/usr/bin/stat
/usr/bin/stty
/usr/bin/sum
/usr/bin/sync
/usr/bin/fsync
/usr/bin/tac
/usr/bin/tail
/usr/bin/tee
/usr/bin/test
/usr/bin/[
/usr/bin/[[
/usr/bin/timeout
/usr/bin/touch
/usr/bin/tr
/usr/bin/true
/usr/bin/truncate
/usr/bin/tsort
/usr/bin/tty
/usr/bin/uname
/usr/bin/arch
/usr/bin/uniq
/usr/bin/unlink
/usr/bin/usleep
/usr/bin/uudecode
/usr/bin/base32
/usr/bin/base64
/usr/bin/uuencode
/usr/bin/wc
/usr/bin/users
/usr/bin/w
/usr/bin/who
/usr/bin/whoami
/usr/bin/yes
/usr/bin/which
/usr/bin/chattr
/usr/sbin/fsck
/usr/bin/lsattr
/usr/bin/awk
/usr/bin/cmp
/usr/bin/diff
/usr/bin/ed
/usr/bin/patch
/usr/bin/sed
/usr/bin/vi
/usr/bin/find
/usr/bin/grep
/usr/bin/egrep
/usr/bin/fgrep
/usr/bin/xargs
/usr/sbin/halt
/usr/sbin/poweroff
/usr/sbin/reboot
/usr/sbin/addgroup
/usr/sbin/adduser
/usr/sbin/chpasswd
/usr/bin/cryptpw
/usr/bin/mkpasswd
/usr/sbin/deluser
/usr/sbin/delgroup
/usr/bin/login
/usr/bin/passwd
/usr/bin/su
/usr/sbin/sulogin
/usr/bin/vlock
/usr/sbin/sendmail
/usr/bin/ascii
/usr/bin/bc
/usr/bin/beep
/usr/bin/getfattr
/usr/bin/hexedit
/usr/bin/less
/usr/bin/lsscsi
/usr/bin/man
/usr/sbin/seedrng
/usr/bin/setfattr
/usr/bin/strings
/usr/bin/time
/usr/bin/tree
/usr/bin/ttysize
/usr/sbin/depmod
/usr/sbin/insmod
/usr/sbin/lsmod
/usr/sbin/modinfo
/usr/sbin/modprobe
/usr/sbin/rmmod
/usr/sbin/arp
/usr/sbin/arping
/usr/sbin/brctl
/usr/sbin/ether-wake
/usr/bin/dnsdomainname
/usr/bin/hostname
/usr/sbin/ifconfig
/usr/sbin/ifenslave
/usr/sbin/ifup
/usr/sbin/ifdown
/usr/sbin/ip
/usr/sbin/ipaddr
/usr/sbin/iplink
/usr/sbin/iproute
/usr/sbin/iprule
/usr/sbin/iptunnel
/usr/sbin/ipneigh
/usr/sbin/nameif
/usr/sbin/nbd-client
/usr/bin/nc
/usr/bin/netstat
/usr/bin/nslookup
/usr/bin/ping
/usr/bin/ping6
/usr/bin/pscan
/usr/sbin/route
/usr/sbin/slattach
/usr/bin/ssl_client
/usr/sbin/tc
/usr/bin/telnet
/usr/bin/tftp
/usr/bin/traceroute
/usr/bin/traceroute6
/usr/sbin/tunctl
/usr/sbin/vconfig
/usr/bin/wget
/usr/bin/whois
/usr/sbin/zcip
/usr/bin/free
/usr/bin/fuser
/usr/bin/iostat
/usr/bin/kill
/usr/bin/killall
/usr/sbin/killall5
/usr/bin/lsof
/usr/bin/mpstat
/usr/bin/nmeter
/usr/bin/pgrep
/usr/bin/pkill
/usr/bin/pidof
/usr/bin/pmap
/usr/bin/ps
/usr/bin/pstree
/usr/bin/pwdx
/usr/bin/smemcap
/usr/sbin/sysctl
/usr/bin/top
/usr/bin/uptime
/usr/bin/watch
/usr/bin/envdir
/usr/bin/chcon
/usr/sbin/getenforce
/usr/sbin/getsebool
/usr/sbin/load_policy
/usr/sbin/matchpathcon
/usr/bin/runcon
/usr/sbin/selinuxenabled
/usr/sbin/sestatus
/usr/sbin/setenforce
/usr/sbin/setfiles
/usr/sbin/restorecon
/usr/sbin/setsebool
/usr/bin/ash
/usr/bin/sh
/usr/bin/hush
/usr/bin/logger
/usr/sbin/syslogd
/usr/sbin/blkid
/usr/bin/cal
/usr/bin/dmesg
/usr/bin/fallocate
/usr/bin/fatattr
/usr/sbin/fdisk
/usr/sbin/findfs
/usr/bin/flock
/usr/bin/getopt
/usr/bin/hexdump
/usr/bin/xxd
/usr/bin/ipcrm
/usr/bin/ipcs
/usr/bin/last
/usr/sbin/losetup
/usr/bin/lspci
/usr/bin/lsusb
/usr/sbin/mdev
/usr/bin/mesg
/usr/sbin/mke2fs
/usr/sbin/mkfs.ext2
/usr/sbin/mkdosfs
/usr/sbin/mkfs.vfat
/usr/sbin/mkswap
/usr/bin/more
/usr/bin/mount
/usr/bin/mountpoint
/usr/sbin/nologin
/usr/bin/nsenter
/usr/bin/renice
/usr/bin/rev
/usr/bin/script
/usr/bin/scriptreplay
/usr/bin/setarch
/usr/bin/linux32
/usr/bin/linux64
/usr/bin/setpriv
/usr/bin/setsid
/usr/sbin/switch_root
/usr/sbin/uevent
/usr/bin/umount
/usr/bin/unshare
/usr/bin/wall
/usr/sbin/udhcpc6
/usr/sbin/udhcpc
++++++ create-filelists.sh ++++++
--- /var/tmp/diff_new_pack.OY8rx6/_old 2025-08-06 14:31:32.447636093 +0200
+++ /var/tmp/diff_new_pack.OY8rx6/_new 2025-08-06 14:31:32.447636093 +0200
@@ -39,6 +39,20 @@
SBINDIR=$(rpm -E %{_sbindir})
DATADIR=$(rpm -E %{_datadir})
+#users, who, uptime are now part of coreutils-systemd,
+#so add them manually to busybox-coreutils for now
+echo -e "$BINDIR/uptime" >> filelist-coreutils.txt
+touch used/uptime
+echo -e "$BINDIR/users" >> filelist-coreutils.txt
+touch used/users
+echo -e "$BINDIR/who" >> filelist-coreutils.txt
+touch used/who
+#udhcpc subpackage
+echo -e "$SBINDIR/udhcpc" >> filelist-udhcpc.txt
+touch used/udhcpc
+echo -e "$SBINDIR/udhcpc6" >> filelist-udhcpc.txt
+touch used/udhcpc6
+
# Merge net-tools sub-packages
cat filelist-net-tools-deprecated.txt >> filelist-net-tools.txt
rm filelist-net-tools-deprecated.txt
@@ -50,6 +64,7 @@
echo -e "$BINDIR/sh" >> filelist-sh.txt
touch used/sh
echo -e "$SBINDIR/loadfont" >> filelist-kbd.txt
+echo -e "$SBINDIR/loadkmap" >> filelist-kbd.txt
touch used/loadkmap used/loadfont
echo -e
"/usr/sbin/addgroup\n/usr/sbin/adduser\n/usr/sbin/delgroup\n/usr/sbin/deluser"
>> filelist-shadow.txt
@@ -88,5 +103,3 @@
-e "s|$DATADIR/busybox/busybox.links|filelist.txt|g" \
$BINDIR/busybox.install > busybox.install
-cat filelist-*.txt | sort -u > filelist.txt
-
++++++ filelist-coreutils.txt ++++++
--- /var/tmp/diff_new_pack.OY8rx6/_old 2025-08-06 14:31:32.511638772 +0200
+++ /var/tmp/diff_new_pack.OY8rx6/_new 2025-08-06 14:31:32.515638939 +0200
@@ -82,10 +82,10 @@
/usr/bin/unexpand
/usr/bin/uniq
/usr/bin/unlink
-/usr/bin/uptime
-/usr/bin/users
/usr/bin/wc
-/usr/bin/who
/usr/bin/whoami
/usr/bin/yes
+/usr/bin/uptime
+/usr/bin/users
+/usr/bin/who
