Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package installation-images for
openSUSE:Factory checked in at 2021-03-10 10:25:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images (Old)
and /work/SRC/openSUSE:Factory/.installation-images.new.2378 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images"
Wed Mar 10 10:25:09 2021 rev:128 rq: version:16.47
Changes:
--------
--- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes
2021-03-08 15:17:39.305956172 +0100
+++
/work/SRC/openSUSE:Factory/.installation-images.new.2378/installation-images.changes
2021-03-10 10:25:11.811769107 +0100
@@ -2,23 +1,0 @@
-Thu Mar 4 16:48:09 UTC 2021 - [email protected]
-
-- merge gh#openSUSE/installation-images#465
-- Prepare UsrMerge (boo#1029961)
-- remove explicit libblogger2 dep
-- clean up kernel module config
-- 16.50
-
---------------------------------------------------------------------
-Wed Mar 3 16:03:14 UTC 2021 - [email protected]
-
-- merge gh#openSUSE/installation-images#462
-- support using zram device as root file system (jsc#PM-2253)
-- 16.49
-
---------------------------------------------------------------------
-Wed Mar 3 10:23:58 UTC 2021 - [email protected]
-
-- merge gh#openSUSE/installation-images#464
-- fix efi local boot entry on x86_64 (bsc#1182891)
-- 16.48
-
---------------------------------------------------------------------
Old:
----
installation-images-16.50.tar.xz
New:
----
installation-images-16.47.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.MlEXvp/_old 2021-03-10 10:25:12.471769777 +0100
+++ /var/tmp/diff_new_pack.MlEXvp/_new 2021-03-10 10:25:12.471769777 +0100
@@ -651,7 +651,7 @@
Summary: Installation Image Files for %theme
License: GPL-2.0-or-later
Group: Metapackages
-Version: 16.50
+Version: 16.47
Release: 0
Provides: installation-images = %version-%release
Conflicts: otherproviders(installation-images)
++++++ installation-images-16.50.tar.xz -> installation-images-16.47.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-16.50/VERSION
new/installation-images-16.47/VERSION
--- old/installation-images-16.50/VERSION 2021-03-04 17:48:09.000000000
+0100
+++ new/installation-images-16.47/VERSION 2021-02-25 15:26:30.000000000
+0100
@@ -1 +1 @@
-16.50
+16.47
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-16.50/changelog
new/installation-images-16.47/changelog
--- old/installation-images-16.50/changelog 2021-03-04 17:48:09.000000000
+0100
+++ new/installation-images-16.47/changelog 2021-02-25 15:26:30.000000000
+0100
@@ -1,17 +1,3 @@
-2021-03-04: 16.50
- - merge gh#openSUSE/installation-images#465
- - Prepare UsrMerge (boo#1029961)
- - remove explicit libblogger2 dep
- - clean up kernel module config
-
-2021-03-03: 16.49
- - merge gh#openSUSE/installation-images#462
- - support using zram device as root file system (jsc#PM-2253)
-
-2021-03-03: 16.48
- - merge gh#openSUSE/installation-images#464
- - fix efi local boot entry on x86_64 (bsc#1182891)
-
2021-02-25: 16.47
- merge gh#openSUSE/installation-images#460
- go back to plymouth-theme-tribar (bsc#1182755)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-16.50/data/base/base.file_list
new/installation-images-16.47/data/base/base.file_list
--- old/installation-images-16.50/data/base/base.file_list 2021-03-04
17:48:09.000000000 +0100
+++ new/installation-images-16.47/data/base/base.file_list 2021-02-25
15:26:30.000000000 +0100
@@ -1,13 +1,5 @@
# some basic directories
-d dev etc mnt proc tmp var usr/{bin,sbin,lib,lib64}
-# filesystem requires compat-usrmerge-tools in usrmerged case, so trigger on
that.
-if exists(compat-usrmerge-tools)
-s usr/bin /bin
-s usr/sbin /sbin
-s usr/lib /lib
-s usr/lib64 /lib64
-endif
-
+d bin dev etc lib mnt proc sbin tmp var
d run/lock
c 1777 0 0 tmp
@@ -62,7 +54,6 @@
AUTODEPS:
# it's using update-alternatives
-# XXX: usrmerge
bash:
/bin/{sh,bash}
/usr/bin/bash
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-16.50/data/boot/grub-efi.cfg
new/installation-images-16.47/data/boot/grub-efi.cfg
--- old/installation-images-16.50/data/boot/grub-efi.cfg 2021-03-04
17:48:09.000000000 +0100
+++ new/installation-images-16.47/data/boot/grub-efi.cfg 2021-02-25
15:26:30.000000000 +0100
@@ -44,7 +44,6 @@
for os in opensuse sles caasp ; do
if [ -f /efi/$os/grub.efi ] ; then
chainloader /efi/$os/grub.efi
- boot
fi
done
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-16.50/data/initrd/initrd.file_list
new/installation-images-16.47/data/initrd/initrd.file_list
--- old/installation-images-16.50/data/initrd/initrd.file_list 2021-03-04
17:48:09.000000000 +0100
+++ new/installation-images-16.47/data/initrd/initrd.file_list 2021-02-25
15:26:30.000000000 +0100
@@ -1,13 +1,6 @@
d run var
s ../run var
-d mnt proc sys tmp mounts root download scripts usr/{bin,sbin,lib,lib64}
-# filesystem requires compat-usrmerge-tools in usrmerged case, so trigger on
that.
-if exists(compat-usrmerge-tools)
-s usr/bin /bin
-s usr/sbin /sbin
-s usr/lib /lib
-s usr/lib64 /lib64
-endif
+d bin mnt proc sys tmp mounts root download scripts
d dev/pts dev/shm
d etc/sysconfig/hardware etc/YaST2 etc/X11
d var/tmp var/adm/mount
@@ -150,7 +143,6 @@
suse-module-tools:
/etc/modprobe.d
-# XXX: usrmerge
?s390-tools:
/sbin/zfcp_*_configure
/sbin/zfcp_san_disc
@@ -159,13 +151,6 @@
/sbin/qeth_configure
/sbin/dasdinfo
/sbin/chzdev
- /usr/sbin/zfcp_*_configure
- /usr/sbin/zfcp_san_disc
- /usr/sbin/iucv_configure
- /usr/sbin/ctc_configure
- /usr/sbin/qeth_configure
- /usr/sbin/dasdinfo
- /usr/sbin/chzdev
/usr/lib/udev
/etc/zkey
/boot
@@ -179,10 +164,8 @@
/usr/share/kbd/consoletrans/trivial
/usr/share/kbd/consolefonts/default8x16.psfu.gz
-# XXX: usrmerge
cifs-utils:
/sbin/mount.cifs
- /usr/sbin/mount.cifs
?acpica:
/usr/sbin/acpidump
@@ -190,10 +173,8 @@
?dmidecode:
/usr/sbin/dmidecode
-# XXX: usrmerge
?bootsplash:
/sbin/splash
- /usr/sbin/splash
if exists(wpa_supplicant)
wpa_supplicant:
@@ -241,22 +222,19 @@
m /usr/bin/rm bin
# it's using update-alternatives
-# XXX: usrmerge
bash:
/bin/{sh,bash}
/usr/bin/bash
s bash usr/bin/sh
- s bash usr/bin/lsh
+ s bash /bin/lsh
ncurses-utils:
/usr/bin/clear
/usr/bin/tset
-# XXX: usrmerge
iproute2:
- /bin/ip
+ /bin/ip
/sbin/ip
- /usr/bin/ip
/usr/sbin/ip
open-iscsi:
@@ -275,16 +253,11 @@
/usr/sbin/losetup
/usr/sbin/blkid
-# XXX: usrmerge
nfs-client:
/sbin/mount.nfs
/sbin/mount.nfs4
/sbin/umount.nfs
/sbin/umount.nfs4
- /sbin/mount.nfs
- /usr/sbin/mount.nfs4
- /usr/sbin/umount.nfs
- /usr/sbin/umount.nfs4
/etc/idmapd.conf
/usr/sbin/rpc.idmapd
/var/lib/nfs
@@ -298,31 +271,26 @@
?libcryptsetup*-hmac:
?libgcrypt20-hmac:
-# XXX: usrmerge
ntfs-3g:
/
s mount.ntfs-3g /sbin/mount.ntfs
- s mount.ntfs-3g /usr/sbin/mount.ntfs
?kexec-tools: nodeps
/usr/sbin/kexec
-# XXX: usrmerge
if exists(blog)
blog:
/usr/lib*
/sbin/showconsole
- /usr/sbin/showconsole
+ c 755 0 0 /sbin/showconsole
sysvinit-tools: nodeps
/sbin/startproc
- /usr/sbin/startproc
else
sysvinit-tools: nodeps
/sbin/showconsole
+ c 755 0 0 /sbin/showconsole
/sbin/startproc
- /usr/sbin/showconsole
- /usr/sbin/startproc
endif
rpm:
@@ -380,10 +348,8 @@
/usr/sbin/useradd.local
d /etc/skel
-# XXX: usrmerge
pam:
/sbin
- /usr/sbin
/etc
/usr/etc
/lib*/libpam*.so.*
@@ -395,15 +361,6 @@
/lib*/security/pam_rootok.so
/lib*/security/pam_permit.so
/lib*/security/pam_deny.so
- /usr/lib*/libpam*.so.*
- /usr/lib*/security/pam_group.so
- /usr/lib*/security/pam_unix*.so
- /usr/lib*/security/pam_env.so
- /usr/lib*/security/pam_limits.so
- /usr/lib*/security/pam_umask.so
- /usr/lib*/security/pam_rootok.so
- /usr/lib*/security/pam_permit.so
- /usr/lib*/security/pam_deny.so
if exists(plymouth)
# Do not EVER consider another plymouth theme before ensuring it doesn't
@@ -430,7 +387,6 @@
procps:
/bin/ps
- /usr/bin/ps
# maybe we don't need everything...
systemd:
@@ -480,9 +436,6 @@
/usr/lib*/gconv/UTF-32.so
/usr/lib*/gconv/gconv-modules*
-# needed for zram support
-e2fsprogs:
- /usr/sbin/mkfs.ext2
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#
@@ -558,10 +511,8 @@
valgrind:
/
- # XXX: usrmerge
kbd:
/bin/kbd_mode
- /usr/bin/kbd_mode
strace:
/usr/bin/strace
@@ -572,18 +523,14 @@
libpython2_6-1_0:
/usr/lib*
- # XXX: usrmerge
libexpat1:
/lib*/libexpat.so.*
- /usr/lib*/libexpat.so.*
libprocps*:
/
- # XXX: usrmerge
psmisc:
/bin/fuser
- /usr/bin/fuser
/usr/bin/killall
/usr/bin/pstree
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-16.50/data/initrd/modules.file_list
new/installation-images-16.47/data/initrd/modules.file_list
--- old/installation-images-16.50/data/initrd/modules.file_list 2021-03-04
17:48:09.000000000 +0100
+++ new/installation-images-16.47/data/initrd/modules.file_list 2021-02-25
15:26:30.000000000 +0100
@@ -58,8 +58,6 @@
r System.map
# copy needed firmware files
-# XXX: usrmerge
-d usr/lib/firmware
d lib/firmware
e mlist3 <kernel_ver> fw || true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-16.50/data/initrd/scripts/zram_setup
new/installation-images-16.47/data/initrd/scripts/zram_setup
--- old/installation-images-16.50/data/initrd/scripts/zram_setup
2021-03-04 17:48:09.000000000 +0100
+++ new/installation-images-16.47/data/initrd/scripts/zram_setup
1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-#! /bin/sh
-
-# zram size is passed as first argument
-size=$1
-
-PATH=/usr/bin:/usr/sbin:/bin:/sbin
-
-# no modprobe
-for i in zram jbd2 mbcache crc16 ext4 ; do
- m=/modules/$i.ko.xz
- [ -f $m ] && insmod $m
-done
-
-echo zstd > /sys/block/zram0/comp_algorithm
-echo $size > /sys/block/zram0/disksize
-
-mkfs.ext2 -q /dev/zram0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-16.50/data/rescue/rescue.file_list
new/installation-images-16.47/data/rescue/rescue.file_list
--- old/installation-images-16.50/data/rescue/rescue.file_list 2021-03-04
17:48:09.000000000 +0100
+++ new/installation-images-16.47/data/rescue/rescue.file_list 2021-02-25
15:26:30.000000000 +0100
@@ -1,14 +1,7 @@
d run var
d run/lock
s ../run var
-d dev etc home mnt proc sys tmp root usr/{bin,sbin,lib,lib64}
-# filesystem requires compat-usrmerge-tools in usrmerged case, so trigger on
that.
-if exists(compat-usrmerge-tools)
-s usr/bin /bin
-s usr/sbin /sbin
-s usr/lib /lib
-s usr/lib64 /lib64
-endif
+d bin dev etc home lib mnt proc sys sbin tmp root
d media/{cdrom,floppy}
c 1777 0 0 tmp
d var/lib/systemd/migrated
@@ -51,13 +44,11 @@
/etc/sysconfig
/root
/run
+ /etc/init.d
/var
# remove temporarily so that 'mount /sys' doesn't work
r /sys
-?compat-usrmerge: ignore
-?compat-usrmerge-tools: ignore
-
AUTODEPS:
dbus-1-x11: ignore
@@ -70,7 +61,6 @@
binutils: ignore
# it's using update-alternatives
-# XXX: usrmerge
bash:
/bin/{sh,bash}
/usr/bin/bash
@@ -236,11 +226,9 @@
t /usr/bin/lessclose.sh
c 0755 0 0 /usr/bin/lessclose.sh
-# XXX: usrmerge
ntfs-3g:
/
s mount.ntfs-3g /sbin/mount.ntfs
- s mount.ntfs-3g /usr/sbin/mount.ntfs
pam:
/
@@ -405,7 +393,6 @@
e mv usr/bin/mount usr/bin/mount.bin
x mount usr/bin
-# XXX: usrmerge
x mount-rootfs-and-do-chroot.sh /bin
# run getty on tty1
@@ -437,6 +424,7 @@
E echo "sysfs /sys sysfs noauto 0 0" >>/etc/fstab
# E echo "usbfs /proc/bus/usb usbfs defaults 0 0" >>/etc/fstab
E echo "devpts /dev/pts devpts mode=0620,gid=5 0 0" >>/etc/fstab
+# E /sbin/SuSEconfig --force --norestarts
d usr/lib/microcode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-16.50/data/root/etc/inst_setup
new/installation-images-16.47/data/root/etc/inst_setup
--- old/installation-images-16.50/data/root/etc/inst_setup 2021-03-04
17:48:09.000000000 +0100
+++ new/installation-images-16.47/data/root/etc/inst_setup 2021-02-25
15:26:30.000000000 +0100
@@ -175,48 +175,6 @@
bash -l
}
-zram_swap_on() {
- zram_swap=`awk '/^zram_swap:/ { print $2 }' /etc/install.inf`
- if [ -n "$zram_swap" ] ; then
- modprobe zram
- zram_dev_index=`cat /sys/class/zram-control/hot_add`
- zram_swap_dev=/dev/zram$zram_dev_index
- if [ -b $zram_swap_dev ] ; then
- echo zstd > /sys/block/zram$zram_dev_index/comp_algorithm
- echo "$zram_swap" > /sys/block/zram$zram_dev_index/disksize
- mkswap $zram_swap_dev >/dev/null
- swapon $zram_swap_dev
- create_zram_swap_disable_hook
- fi
- fi
-}
-
-zram_swap_off() {
- if [ -b $zram_swap_dev ] ; then
- swapoff $zram_swap_dev
- echo $zram_dev_index > /sys/class/zram-control/hot_remove
- fi
-}
-
-create_zram_swap_disable_hook() {
- tmp_dir=$(mktemp -d)
- hook_dir=/var/lib/YaST2/hooks/installation
- script=before_instsys_cleanup_10_zram_swap
-
- # make $hook_dir writable
- mkdir -p $tmp_dir/$hook_dir
- adddir $tmp_dir /
-
- cat > $hook_dir/$script <<XXX
-#! /bin/sh -x
-swapoff $zram_swap_dev
-echo $zram_dev_index > /sys/class/zram-control/hot_remove
-XXX
- chmod +x $hook_dir/$script
-}
-
-zram_swap_on
-
[ -f /tmp/host_ips ] && cat /tmp/host_ips
[ "$START_SHELL" ] && start_shell
@@ -305,7 +263,5 @@
# shellcheck disable=SC2016 # the ${} is for sed, not a shell expansion mistake
sed -n '1{h;n};x;H;${x;p}' /proc/mounts | awk '{ if($2 ~ /^\/var/)
system("umount " $2) }'
-zram_swap_off
-
exit $ec
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-16.50/data/root/root.file_list
new/installation-images-16.47/data/root/root.file_list
--- old/installation-images-16.50/data/root/root.file_list 2021-03-04
17:48:09.000000000 +0100
+++ new/installation-images-16.47/data/root/root.file_list 2021-02-25
15:26:30.000000000 +0100
@@ -1,13 +1,6 @@
-d dev etc mnt root tmp usr var proc
+d bin dev etc lib mnt root sbin tmp usr var proc
c 1777 0 0 tmp
d /usr/{bin,lib,lib64,libexec,sbin,share}
-# filesystem requires compat-usrmerge-tools in usrmerged case, so trigger on
that.
-if exists(compat-usrmerge-tools)
-s usr/bin /bin
-s usr/sbin /sbin
-s usr/lib /lib
-s usr/lib64 /lib64
-endif
# add some /etc files
x /etc/* /etc
@@ -225,7 +218,6 @@
# pull in yast2 installation related packages via package deps
skelcd-control-<skelcd_ctrl_theme>:
-# XXX: usrmerge
rpm:
/bin
/etc
@@ -241,7 +233,6 @@
s gawk usr/bin/awk
# it's using update-alternatives
-# XXX: usrmerge
bash:
/bin/{sh,bash}
/usr/bin/bash
@@ -250,14 +241,12 @@
# Note that this does not make it the default shell /bin/sh,
# only scripts that explicitly want dash will use it,
# so we are safe even if there are undetected bashisms in some scripts.
-# XXX: usrmerge
dash:
/bin/dash
/usr/bin/dash
nfs-client:
/sbin/{u,}mount.nfs*
- /usr/sbin/{u,}mount.nfs*
/usr/sbin/rpc.statd
/usr/sbin/start-statd
/usr/sbin/showmount
@@ -335,10 +324,8 @@
# p repair.diff
if arch eq 'ppc' || arch eq 'ppc64'
- # XXX: usrmerge
pdisk:
/sbin/pdisk
- /usr/sbin/pdisk
hfsutils:
/usr/bin/hattrib
@@ -357,8 +344,9 @@
s hattrib /usr/bin/hvol
endif
-# XXX: usrmerge
sysvinit-tools:
+ /
+ c 755 0 0 /sbin/showconsole
krb5:
/etc
@@ -367,7 +355,6 @@
/usr/lib*/libgssapi_krb5.so.*
/usr/lib*/libk5crypto.so.*
-# XXX: usrmerge
pam:
/usr/etc/pam.d
/etc/pam.d
@@ -377,11 +364,6 @@
/lib*/libpam_misc.so.*
/lib*
/sbin
- /usr/lib*/security
- /usr/lib*/libpam.so.*
- /usr/lib*/libpam_misc.so.*
- /usr/lib*
- /usr/sbin
cracklib: nodeps
/usr/sbin/cracklib-check
@@ -605,10 +587,8 @@
/usr/share/icons/DMZ
endif
-# XXX: usrmerge
multipath-tools:
/sbin
- /usr/sbin
graphviz-gnome: nodeps
/usr/lib*/graphviz/libgvplugin_pango.so.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-16.50/data/root/zenroot.file_list
new/installation-images-16.47/data/root/zenroot.file_list
--- old/installation-images-16.50/data/root/zenroot.file_list 2021-03-04
17:48:09.000000000 +0100
+++ new/installation-images-16.47/data/root/zenroot.file_list 2021-02-25
15:26:30.000000000 +0100
@@ -1,15 +1,7 @@
d run var
d run/lock
s ../run var
-d dev etc home mnt proc sys tmp root usr/{bin,sbin,lib,lib64}
-# filesystem requires compat-usrmerge-tools in usrmerged case, so trigger on
that.
-if exists(compat-usrmerge-tools)
-s usr/bin /bin
-s usr/sbin /sbin
-s usr/lib /lib
-s usr/lib64 /lib64
-endif
-
+d bin dev etc home lib mnt proc sys sbin tmp root
d media/{cdrom,floppy}
c 1777 0 0 tmp
d var/lib/systemd/migrated
@@ -40,13 +32,11 @@
/etc/sysconfig
/root
/run
+ /etc/init.d
/var
# remove temporarily so that 'mount /sys' doesn't work
r /sys
-?compat-usrmerge: ignore
-?compat-usrmerge-tools: ignore
-
AUTODEPS:
<release_theme>-release: nodeps
@@ -120,7 +110,6 @@
/usr/lib*/libk5crypto.so.*
# it's using update-alternatives
-# XXX: usrmerge
bash:
/bin/{sh,bash}
/usr/bin/bash
@@ -156,10 +145,8 @@
# remove these:
r root mnt tmp usr/libexec
-# XXX: usrmerge
:
r /lib*/security/pam_userdb.so
- r /usr/lib*/security/pam_userdb.so
x etc/inst_setup_ssh /sbin/
c 755 0 0 /sbin/inst_setup_ssh
@@ -174,10 +161,8 @@
acpica:
/usr/sbin/acpidump
-# XXX: usrmerge
sysconfig:
/sbin
- /usr/sbin
# for modify_resolvconf
d etc/sysconfig/network
e echo MODIFY_RESOLV_CONF_DYNAMICALLY=\"yes\" >etc/sysconfig/network/config
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-16.50/etc/module.config
new/installation-images-16.47/etc/module.config
--- old/installation-images-16.50/etc/module.config 2021-03-04
17:48:09.000000000 +0100
+++ new/installation-images-16.47/etc/module.config 2021-02-25
15:26:30.000000000 +0100
@@ -341,7 +341,6 @@
kernel/drivers/net/team/.*
kernel/drivers/net/tokenring/.*
kernel/drivers/net/wireguard/.*
-kernel/net/9p/.*
kernel/net/ieee802154/.*
kernel/net/ipv4/.*
kernel/net/mac802154/.*
@@ -444,7 +443,6 @@
dmapi,,-
overlay,,-
overlayfs,,-
-9p,,-
[ppc]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-16.50/etc/module.list
new/installation-images-16.47/etc/module.list
--- old/installation-images-16.50/etc/module.list 2021-03-04
17:48:09.000000000 +0100
+++ new/installation-images-16.47/etc/module.list 2021-02-25
15:26:30.000000000 +0100
@@ -57,79 +57,46 @@
kernel/drivers/ssb/
kernel/drivers/leds/led-class.ko
kernel/drivers/mmc/core/
-
-kernel/fs/9p/
kernel/fs/autofs4/
-kernel/fs/binfmt_misc.ko
-kernel/fs/btrfs/
-kernel/fs/cifs/
-kernel/fs/configfs/
kernel/fs/cramfs/
-kernel/fs/dmapi/
-kernel/fs/efivarfs/
kernel/fs/exfat/
-kernel/fs/exofs/libore.ko
-kernel/fs/exportfs/
kernel/fs/ext2/
kernel/fs/ext3/
kernel/fs/ext4/
kernel/fs/fat/
-kernel/fs/fscache/
kernel/fs/fuse/
kernel/fs/hfs/
kernel/fs/hfsplus/
kernel/fs/hpfs/
kernel/fs/isofs/
+kernel/fs/udf/
kernel/fs/jbd/
kernel/fs/jbd2/
kernel/fs/jfs/
-kernel/fs/lockd/
-kernel/fs/mbcache.ko
-kernel/fs/ncpfs/
-kernel/fs/nfs/
-kernel/fs/nfs_common/
-kernel/fs/nfsd/
-kernel/fs/nls/
kernel/fs/ntfs/
-kernel/fs/overlayfs/
-kernel/fs/reiser4/
kernel/fs/reiserfs/
+kernel/fs/reiser4/
kernel/fs/smbfs/
kernel/fs/squashfs/
-kernel/fs/udf/
-kernel/fs/vboxsf/
+kernel/fs/cifs/
kernel/fs/vfat/
kernel/fs/xfs/
-
-kernel/net/9p/
+kernel/fs/dmapi/
+kernel/fs/exportfs/
+kernel/fs/ncpfs/
+kernel/fs/nls/
+kernel/fs/binfmt_misc.ko
+kernel/fs/nfs/
+kernel/fs/nfs_common/
+kernel/fs/nfsd/
+kernel/fs/lockd/
+kernel/fs/mbcache.ko
+kernel/fs/configfs/
+kernel/fs/btrfs/
+kernel/fs/exofs/libore.ko
+kernel/fs/overlayfs/
kernel/net/sunrpc/sunrpc.ko
kernel/net/sunrpc/auth_gss/auth_rpcgss.ko
-kernel/net/packet/
-kernel/net/rfkill/rfkill.ko
-kernel/net/iucv/
-kernel/net/ipv6/ipv6.ko
-kernel/net/ipv4/gre.ko
-kernel/net/ieee80211/
-kernel/net/mac80211/mac80211.ko
-kernel/net/mac80211/rc80211_simple.ko
-kernel/net/wireless/
-kernel/net/wimax/
-kernel/net/ceph/
-kernel/net/802/tr.ko
-kernel/net/802/fddi.ko
-kernel/net/phonet/phonet.ko
-kernel/net/ieee802154/ieee802154.ko
-kernel/net/mac802154/
-kernel/net/dsa/dsa_core.ko
-kernel/net/ipv4/ip_tunnel.ko
-kernel/net/dns_resolver/dns_resolver.ko
-kernel/net/ipv4/inet_lro.ko
-kernel/net/8021q/
-kernel/net/802/garp.ko
-kernel/net/802/stp.ko
-kernel/net/802/mrp.ko
-kernel/net/llc/
-
kernel/drivers/power/power_supply.ko
kernel/drivers/firmware/
kernel/drivers/acpi/
@@ -145,12 +112,15 @@
kernel/drivers/hwmon/hwmon.ko
kernel/drivers/thermal/thermal_sys.ko
+
# kernel pcmcia
# see data/initrd/initrd_base.list
/pcmcia/
-kernel/drivers/char/pcmcia/synclink_cs.ko
-/sound/pcmcia/
+kernel/net/packet/
+kernel/net/rfkill/rfkill.ko
kernel/lib/
kernel/arch/ia64/sn/kernel
kernel/drivers/sn
@@ -158,6 +128,9 @@
kernel/arch/s390/
kernel/drivers/s390/
+kernel/net/iucv/
+kernel/net/ipv6/ipv6.ko
+kernel/net/ipv4/gre.ko
kernel/crypto/
kernel/arch/[^/]*/crypto/
@@ -180,6 +153,12 @@
kernel/drivers/xen/xen-scsiback.ko
kernel/drivers/video/fbdev/xen-fbfront.ko
+kernel/net/ieee80211/
+
+kernel/net/mac80211/mac80211.ko
+kernel/net/mac80211/rc80211_simple.ko
+kernel/net/wireless/
+
kernel/drivers/bcma/
kernel/drivers/rtc/
@@ -194,8 +173,13 @@
kernel/drivers/virtio/
+kernel/net/wimax/
+kernel/net/ceph/
kernel/drivers/usb/wusbcore/
kernel/drivers/uwb/
+kernel/fs/fscache/
+kernel/net/802/tr.ko
+kernel/net/802/fddi.ko
kernel/drivers/misc/tifm_core.ko
kernel/drivers/usb/misc/ftdi-elan.ko
@@ -205,6 +189,7 @@
kernel/drivers/connector/
kernel/drivers/uio/uio.ko
kernel/drivers/misc/cb710/
+kernel/net/phonet/phonet.ko
kernel/drivers/mfd/ab3100-core.ko
kernel/drivers/gpu/drm/
# kernel/drivers/gpu/drm/drm.ko
@@ -223,17 +208,29 @@
kernel/drivers/staging/rtl.*
kernel/drivers/usb/misc/ezusb.ko
+kernel/net/ieee802154/ieee802154.ko
+kernel/net/mac802154/
kernel/drivers/media/rc/rc-core.ko
kernel/sound/ac97_bus.ko
kernel/drivers/target/target_core_mod.ko
+kernel/net/dsa/dsa_core.ko
+kernel/net/ipv4/ip_tunnel.ko
kernel/drivers/leds/led-class.ko
+kernel/net/dns_resolver/dns_resolver.ko
kernel/drivers/rapidio/rapidio.ko
kernel/drivers/ntb/ntb.ko
+kernel/net/ipv4/inet_lro.ko
kernel/drivers/target/iscsi/iscsi_target_mod.ko
kernel/drivers/infiniband/
+kernel/net/8021q/
+kernel/net/802/garp.ko
+kernel/net/802/stp.ko
+kernel/net/802/mrp.ko
+kernel/net/llc/
+
kernel/drivers/vhost/vringh.ko
kernel/drivers/of/
@@ -252,10 +249,12 @@
kernel/drivers/pinctrl/
kernel/drivers/watchdog/
+kernel/fs/efivarfs/
kernel/drivers/dma/bcm2835-dma.ko
kernel/drivers/dma/tegra20-apb-dma.ko
+kernel/fs/vboxsf/
kernel/drivers/virt/vboxguest/
# RPi4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-16.50/gefrickel
new/installation-images-16.47/gefrickel
--- old/installation-images-16.50/gefrickel 2021-03-04 17:48:09.000000000
+0100
+++ new/installation-images-16.47/gefrickel 2021-02-25 15:26:30.000000000
+0100
@@ -27,30 +27,28 @@
[ -z "$mksquashfs" ] && err "mksquashfs missing"
-if [ -L lib ]; then
- pfx="usr/"
-fi
+# lib vs. lib64
+lib_dir=`echo lib*/libc.so.*`
+lib_dir=${lib_dir%%/*}
# - - - lib/{modules,firmware} - - -
#
# all mods ex loop & squashfs
#
-base_modules="loop squashfs lz4_decompress xxhash zstd_decompress zram ext4
crc16 mbcache jbd2"
-echo "$base_modules" > .base_modules
-m_dir=`echo ${pfx}lib/modules/*/initrd`
+m_dir=`echo lib/modules/*/initrd`
[ -d "$m_dir" ] || err "no kernel module dir"
mkdir -p "b/$m_dir"
-for i in $base_modules ; do
+for i in loop squashfs lz4_decompress xxhash zstd_decompress; do
for suffix in ko ko.xz; do
[ -f $m_dir/$i.$suffix ] && mv $m_dir/$i.$suffix b/$m_dir
done
done
-mkdir -p a/${pfx}lib
-mv ${pfx}lib/modules a/${pfx}lib
-[ -d ${pfx}lib/firmware ] && mv ${pfx}lib/firmware a/${pfx}lib
+mkdir -p a/lib
+mv lib/modules a/lib
+[ -d lib/firmware ] && mv lib/firmware a/lib
# but NOT udev
# [ -d lib/udev ] && mv lib/udev a/lib
-mv b/${pfx}lib/modules ${pfx}lib
+mv b/lib/modules lib
squash a 00_lib
rm -rf a b
@@ -58,34 +56,19 @@
#
# keep libs for linuxrc
#
-# lib vs. lib64
-lib_dir=usr/lib
-mkdir -p "b/$lib_dir"
-# for usrmerge
-if [ -e "$lib_dir/modules" ]; then
- mv "$lib_dir/modules" "b/$lib_dir"
-fi
-if [ -d ${lib_dir}64 ]; then
- lib_dir=${lib_dir}64
-fi
-mkdir -p "b/$lib_dir"
+mkdir -p "b/usr/$lib_dir"
# don't forget .lib*.hmac files (bsc#1178208)
-for i in $lib_dir/lib* $lib_dir/.lib*; do
+for i in usr/$lib_dir/lib* usr/$lib_dir/.lib* ; do
case $i in *librpm*) continue ;; esac
- mv $i b/$lib_dir
+ [ -e "$i" ] && mv $i b/usr/$lib_dir
done
-# need to keep the linker in usrmerge case
-if [ -n "$pfx" ]; then
- mv $lib_dir/ld-* b/$lib_dir || :
-fi
# empty usr/sbin is needed to avoid bsc#1169094 (cross-filesystem relative
# symlinks to kmod)
mkdir -p b/usr/bin b/usr/sbin
-# some things are needed from /usr/bin or /usr/sbin
-for i in kmod bash mount setsid sh ln touch chmod mkdir insmod mkfs.ext2 ; do
+# some things are needed from /usr/bin
+for i in kmod bash mount setsid sh; do
[ -e usr/bin/$i -o -L usr/bin/$i ] && mv usr/bin/$i b/usr/bin
- [ -e usr/sbin/$i -o -L usr/sbin/$i ] && mv usr/sbin/$i b/usr/sbin
done
mkdir -p a
mv usr a
