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 2024-10-04 17:08:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/busybox-links (Old) and /work/SRC/openSUSE:Factory/.busybox-links.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "busybox-links" Fri Oct 4 17:08:42 2024 rev:33 rq:1205683 version:MACRO Changes: -------- --- /work/SRC/openSUSE:Factory/busybox-links/busybox-links.changes 2024-02-23 16:40:46.553433254 +0100 +++ /work/SRC/openSUSE:Factory/.busybox-links.new.19354/busybox-links.changes 2024-10-04 17:08:45.992381397 +0200 @@ -1,0 +2,13 @@ +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. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ busybox-links.spec ++++++ --- /var/tmp/diff_new_pack.dfQ6ue/_old 2024-10-04 17:08:51.000590614 +0200 +++ /var/tmp/diff_new_pack.dfQ6ue/_new 2024-10-04 17:08:51.012591115 +0200 @@ -85,6 +85,7 @@ # 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} @@ -611,15 +612,17 @@ %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}%{_bindir}/busybox +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 %if 0%{?suse_version} < 1550 ln -sf %{_bindir}/sh %{buildroot}/bin/sh ++++++ busybox.install ++++++ --- /var/tmp/diff_new_pack.dfQ6ue/_old 2024-10-04 17:08:51.208599304 +0200 +++ /var/tmp/diff_new_pack.dfQ6ue/_new 2024-10-04 17:08:51.212599471 +0200 @@ -15,7 +15,7 @@ # Source the configuration #. ./.config -h=`sort filelist.txt | uniq` +h=`sort /usr/share/busybox/busybox.links | uniq` sharedlib_dir="0_lib" @@ -60,8 +60,8 @@ done fi -if [ x"$cleanup" = x"1" ] && [ -e "$prefix/usr/bin/busybox" ]; then - inode=`ls -i "$prefix/usr/bin/busybox" | awk '{print $1}'` +if [ x"$cleanup" = x"1" ] && [ -e "$prefix/bin/busybox" ]; then + inode=`ls -i "$prefix/bin/busybox" | awk '{print $1}'` sub_shell_it=` cd "$prefix" for d in usr/sbin usr/bin sbin bin; do @@ -76,9 +76,9 @@ exit 0 fi -rm -f "$prefix/usr/bin/busybox" || exit 1 +rm -f "$prefix/bin/busybox" || exit 1 mkdir -p "$prefix/bin" || exit 1 -install -m 755 /usr/bin/busybox "$prefix/usr/bin/busybox" || exit 1 +install -m 755 /usr/bin/busybox "$prefix/bin/busybox" || exit 1 for i in $h; do appdir=`dirname "$i"` @@ -93,7 +93,7 @@ ln $linkopts busybox "$prefix/$i" || exit 1 else rm -f "$prefix/$i" - echo "../usr/bin/busybox" >"$prefix/$i" + echo "#!/bin/busybox" >"$prefix/$i" chmod +x "$prefix/$i" fi echo " $prefix/$i" @@ -108,19 +108,16 @@ fi else if [ x"$linkopts" = x"-f" ]; then - bb_path="$prefix/usr/bin/busybox" + bb_path="$prefix/bin/busybox" else case "$appdir" in /) - bb_path="../usr/bin/busybox" + bb_path="usr/bin/busybox" ;; - /bin) - bb_path="../usr/bin/busybox" - ;; - /sbin) - bb_path="../usr/bin/busybox" + /bin | /usr/bin) + bb_path="../bin/busybox" ;; - /usr/bin | /usr/sbin) + /sbin | /usr/sbin) bb_path="../bin/busybox" ;; *) ++++++ filelist-attr.txt ++++++ --- /var/tmp/diff_new_pack.dfQ6ue/_old 2024-10-04 17:08:51.248600975 +0200 +++ /var/tmp/diff_new_pack.dfQ6ue/_new 2024-10-04 17:08:51.256601309 +0200 @@ -1,2 +1,3 @@ +/usr/bin/getfattr /usr/bin/setfattr ++++++ filelist-kbd.txt ++++++ --- /var/tmp/diff_new_pack.dfQ6ue/_old 2024-10-04 17:08:51.508611837 +0200 +++ /var/tmp/diff_new_pack.dfQ6ue/_new 2024-10-04 17:08:51.512612004 +0200 @@ -7,4 +7,5 @@ /usr/bin/showkey /usr/bin/vlock /usr/sbin/loadfont +/usr/sbin/loadkmap