diff --git a/list-common.sh b/list-common.sh index 94436d6..47e98d8 100644 --- a/list-common.sh +++ b/list-common.sh @@ -43,6 +43,7 @@ buildignore patterns-desktop-multimedia_opt buildignore patterns-openSUSE-non_oss_opt buildignore patterns-office-office_opt buildignore patterns-base-x11_opt +buildignore patterns-base-x11_enhanced buildignore make buildignore netpbm buildignore p7zip-full @@ -232,7 +233,6 @@ install dosfstools install e2fsprogs install efibootmgr install gtk2-branding-openSUSE -install insserv install ipw-firmware install iw install jfsutils diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi index b20e505..5feb86e 100644 --- a/livecd-leap-gnome.kiwi +++ b/livecd-leap-gnome.kiwi @@ -147,6 +147,8 @@ + + @@ -350,7 +352,6 @@ - diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi index 98f90e3..c6c7a7a 100644 --- a/livecd-leap-kde.kiwi +++ b/livecd-leap-kde.kiwi @@ -147,6 +147,8 @@ + + @@ -350,7 +352,6 @@ - diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi index 8848bee..cfaf4cd 100644 --- a/livecd-leap-x11.kiwi +++ b/livecd-leap-x11.kiwi @@ -147,6 +147,8 @@ + + @@ -350,7 +352,6 @@ - diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes index 031a79e..02a6b6d 100644 --- a/livecd-openSUSE.changes +++ b/livecd-openSUSE.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 12 13:45:40 UTC 2021 - Fabian Vogt + +- list-common: Drop insserv, ignore patterns-base-x11_enhanced. On TW, + it was ignored because of the xorg-x11-essentials block anyway. + ------------------------------------------------------------------- Fri Jan 22 11:44:45 UTC 2021 - Dominique Leuenberger diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi index 2065efd..771181e 100644 --- a/livecd-tumbleweed-gnome.kiwi +++ b/livecd-tumbleweed-gnome.kiwi @@ -147,6 +147,8 @@ + + @@ -353,7 +355,6 @@ - diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi index ad8680f..84e4e15 100644 --- a/livecd-tumbleweed-kde.kiwi +++ b/livecd-tumbleweed-kde.kiwi @@ -147,6 +147,8 @@ + + @@ -353,7 +355,6 @@ - diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi index d4c0a48..f905059 100644 --- a/livecd-tumbleweed-x11.kiwi +++ b/livecd-tumbleweed-x11.kiwi @@ -147,6 +147,8 @@ + + @@ -353,7 +355,6 @@ - diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi index 9d4b530..ac61665 100644 --- a/livecd-tumbleweed-xfce.kiwi +++ b/livecd-tumbleweed-xfce.kiwi @@ -147,6 +147,8 @@ + + @@ -353,7 +355,6 @@ - diff --git a/pkg-diff.sh b/pkg-diff.sh index 281e117..b116275 100644 --- a/pkg-diff.sh +++ b/pkg-diff.sh @@ -14,7 +14,7 @@ fetch_pkglist() { local arch=$4 local binaryname=$(osc ls -b ${project} ${package} -a ${arch} -r ${repo} | grep .packages | xargs) - osc api /build/${project}/${repo}/${arch}/${package}/${binaryname} | awk -F\| '{ print printf "%s-%s-%s\n", $1, $3, $4 }' | sort -u + osc api /build/${project}/${repo}/${arch}/${package}/${binaryname} | awk -F\| '{ printf "%s-%s-%s\n", $1, $3, $4 }' | sort -u } tmpdir=$(mktemp -d)