rpm/livecd-openSUSE
SHA256
1
0
Fork 0
forked from pool/livecd-openSUSE
Code Pull Requests Activity

Accepting request 650347 from Virtualization:Appliances:Images:openSUSE-Tumbleweed

Browse Source 
- Allow binutils, but force-remove it in config.sh (bsc#1116665)

OBS-URL: https://build.opensuse.org/request/show/650347
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/livecd-openSUSE?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger 2018-11-20 09:23:18 +00:00 committed by Git OBS Bridge
commit e2adb1469b
9 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.sh
View File

@ -25,6 +25,8 @@ pl=$(rpmqpack | grep openSUSE-release-livecd-)
# as <censored> kiwi does not make the flavor accessible
desktop=$(echo "$pl" | awk -F- '{ print $4 }' | tr A-Z a-z)
# Not needed, but required by suse-module-tools (bsc#1116665)
rpm -q binutils && rpm -e --nodeps binutils
# Not needed, but required by dracut-kiwi-live -> cdrkit-cdrtools-compat
rpm -q wodim && rpm -e --nodeps wodim
# Actually a hack: xrdb requires this, but on livecds it's not used

2
list-common.sh
View File

@ -65,8 +65,6 @@ buildignore libqmi-tools
buildignore python3-pip
buildignore binutils
buildignore multipath-tools-rbd
buildignore xorg-x11-Xvnc

2
livecd-leap-gnome.kiwi
View File

@ -170,8 +170,6 @@
<ignore name="libqmi-tools"/>
<package name="aaa_base" replaces="python3-pip"/>
<ignore name="python3-pip"/>
<package name="aaa_base" replaces="binutils"/>
<ignore name="binutils"/>
<package name="aaa_base" replaces="multipath-tools-rbd"/>
<ignore name="multipath-tools-rbd"/>
<package name="aaa_base" replaces="xorg-x11-Xvnc"/>

2
livecd-leap-kde.kiwi
View File

@ -170,8 +170,6 @@
<ignore name="libqmi-tools"/>
<package name="aaa_base" replaces="python3-pip"/>
<ignore name="python3-pip"/>
<package name="aaa_base" replaces="binutils"/>
<ignore name="binutils"/>
<package name="aaa_base" replaces="multipath-tools-rbd"/>
<ignore name="multipath-tools-rbd"/>
<package name="aaa_base" replaces="xorg-x11-Xvnc"/>

2
livecd-leap-x11.kiwi
View File

@ -170,8 +170,6 @@
<ignore name="libqmi-tools"/>
<package name="aaa_base" replaces="python3-pip"/>
<ignore name="python3-pip"/>
<package name="aaa_base" replaces="binutils"/>
<ignore name="binutils"/>
<package name="aaa_base" replaces="multipath-tools-rbd"/>
<ignore name="multipath-tools-rbd"/>
<package name="aaa_base" replaces="xorg-x11-Xvnc"/>

5
livecd-openSUSE.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Nov 20 09:11:15 UTC 2018 - Fabian Vogt <fvogt@suse.com>
- Allow binutils, but force-remove it in config.sh (bsc#1116665)
-------------------------------------------------------------------
Wed Nov 7 12:49:31 UTC 2018 - Fabian Vogt <fvogt@suse.com>

2
livecd-tumbleweed-gnome.kiwi
View File

@ -170,8 +170,6 @@
<ignore name="libqmi-tools"/>
<package name="aaa_base" replaces="python3-pip"/>
<ignore name="python3-pip"/>
<package name="aaa_base" replaces="binutils"/>
<ignore name="binutils"/>
<package name="aaa_base" replaces="multipath-tools-rbd"/>
<ignore name="multipath-tools-rbd"/>
<package name="aaa_base" replaces="xorg-x11-Xvnc"/>

2
livecd-tumbleweed-kde.kiwi
View File

@ -170,8 +170,6 @@
<ignore name="libqmi-tools"/>
<package name="aaa_base" replaces="python3-pip"/>
<ignore name="python3-pip"/>
<package name="aaa_base" replaces="binutils"/>
<ignore name="binutils"/>
<package name="aaa_base" replaces="multipath-tools-rbd"/>
<ignore name="multipath-tools-rbd"/>
<package name="aaa_base" replaces="xorg-x11-Xvnc"/>

2
livecd-tumbleweed-x11.kiwi
View File

@ -170,8 +170,6 @@
<ignore name="libqmi-tools"/>
<package name="aaa_base" replaces="python3-pip"/>
<ignore name="python3-pip"/>
<package name="aaa_base" replaces="binutils"/>
<ignore name="binutils"/>
<package name="aaa_base" replaces="multipath-tools-rbd"/>
<ignore name="multipath-tools-rbd"/>
<package name="aaa_base" replaces="xorg-x11-Xvnc"/>