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

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

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/832726
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/livecd-openSUSE?expand=0&rev=119
This commit is contained in:
Dominique Leuenberger 2020-09-07 19:35:52 +00:00 committed by Git OBS Bridge
commit e5ab1cde80
11 changed files with 76 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
list-common.sh
View File

@ -232,7 +232,6 @@ install mpt-firmware
install nano install nano
install ntfs-3g install ntfs-3g
install open-iscsi install open-iscsi
install pcmciautils
install pptp install pptp
install quota install quota
install reiserfs install reiserfs
@ -267,16 +266,18 @@ install xf86-video-voodoo
install xfsdump install xfsdump
install xfsprogs install xfsprogs
install xz install xz
#install yast2-trans-cs
#install yast2-trans-da
install yast2-trans-de install yast2-trans-de
#install yast2-trans-es if [ "$distro" = "leap" ]; then
#install yast2-trans-ja install yast2-trans-cs
#install yast2-trans-pl install yast2-trans-da
#install yast2-trans-ru install yast2-trans-es
#install yast2-trans-sv install yast2-trans-ja
#install yast2-trans-zh_CN install yast2-trans-pl
#install yast2-trans-zh_TW install yast2-trans-ru
install yast2-trans-sv
install yast2-trans-zh_CN
install yast2-trans-zh_TW
fi
install zd1211-firmware install zd1211-firmware
install zip install zip

6
list-x11.sh
View File

@ -47,9 +47,11 @@ buildignore avahi
buildignore fprintd buildignore fprintd
buildignore accountsservice buildignore accountsservice
buildignore MozillaFirefox buildignore MozillaFirefox
buildignore vim
buildignore vim-data buildignore vim-data
install vim-small if [ "$distro" = "tumbleweed" ]; then
buildignore vim
install vim-small
fi
buildignore tcpdump buildignore tcpdump
install gparted install gparted

16
livecd-leap-gnome.kiwi
View File

@ -2,7 +2,7 @@
<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 --> <!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
<image schemaversion="6.5" name="openSUSE-Leap-%OS_VERSION_ID%-GNOME-Live" displayname="openSUSE Leap %OS_VERSION_ID% GNOME Live"> <image schemaversion="6.5" name="openSUSE-Jump-%OS_VERSION_ID%-GNOME-Live" displayname="openSUSE Jump %OS_VERSION_ID% GNOME Live">
<description type="system"> <description type="system">
<author>openSUSE Project</author> <author>openSUSE Project</author>
<contact>opensuse@opensuse.org</contact> <contact>opensuse@opensuse.org</contact>
@ -13,7 +13,7 @@
<profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/> <profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
</profiles> </profiles>
<preferences profiles="EFI"> <preferences profiles="EFI">
<type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_%OS_VERSION_ID%_GNOME_Live" mediacheck="true"/> <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Jump_%OS_VERSION_ID%_GNOME_Live" mediacheck="true"/>
<version>2.8.0</version> <version>2.8.0</version>
<bootloader-theme>openSUSE</bootloader-theme> <bootloader-theme>openSUSE</bootloader-theme>
<bootsplash-theme>bgrt</bootsplash-theme> <bootsplash-theme>bgrt</bootsplash-theme>
@ -23,7 +23,7 @@
<rpm-excludedocs>true</rpm-excludedocs> <rpm-excludedocs>true</rpm-excludedocs>
</preferences> </preferences>
<preferences profiles="noEFI"> <preferences profiles="noEFI">
<type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_%OS_VERSION_ID%_GNOME_Live" mediacheck="true"/> <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Jump_%OS_VERSION_ID%_GNOME_Live" mediacheck="true"/>
<version>2.8.0</version> <version>2.8.0</version>
<bootloader-theme>openSUSE</bootloader-theme> <bootloader-theme>openSUSE</bootloader-theme>
<bootsplash-theme>bgrt</bootsplash-theme> <bootsplash-theme>bgrt</bootsplash-theme>
@ -352,7 +352,6 @@
<package name="nano"/> <package name="nano"/>
<package name="ntfs-3g"/> <package name="ntfs-3g"/>
<package name="open-iscsi"/> <package name="open-iscsi"/>
<package name="pcmciautils"/>
<package name="pptp"/> <package name="pptp"/>
<package name="quota"/> <package name="quota"/>
<package name="reiserfs"/> <package name="reiserfs"/>
@ -388,6 +387,15 @@
<package name="xfsprogs"/> <package name="xfsprogs"/>
<package name="xz"/> <package name="xz"/>
<package name="yast2-trans-de"/> <package name="yast2-trans-de"/>
<package name="yast2-trans-cs"/>
<package name="yast2-trans-da"/>
<package name="yast2-trans-es"/>
<package name="yast2-trans-ja"/>
<package name="yast2-trans-pl"/>
<package name="yast2-trans-ru"/>
<package name="yast2-trans-sv"/>
<package name="yast2-trans-zh_CN"/>
<package name="yast2-trans-zh_TW"/>
<package name="zd1211-firmware"/> <package name="zd1211-firmware"/>
<package name="zip"/> <package name="zip"/>
<package name="aaa_base" replaces="ntp"/> <package name="aaa_base" replaces="ntp"/>

16
livecd-leap-kde.kiwi
View File

@ -2,7 +2,7 @@
<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 --> <!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
<image schemaversion="6.5" name="openSUSE-Leap-%OS_VERSION_ID%-KDE-Live" displayname="openSUSE Leap %OS_VERSION_ID% KDE Live"> <image schemaversion="6.5" name="openSUSE-Jump-%OS_VERSION_ID%-KDE-Live" displayname="openSUSE Jump %OS_VERSION_ID% KDE Live">
<description type="system"> <description type="system">
<author>openSUSE Project</author> <author>openSUSE Project</author>
<contact>opensuse@opensuse.org</contact> <contact>opensuse@opensuse.org</contact>
@ -13,7 +13,7 @@
<profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/> <profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
</profiles> </profiles>
<preferences profiles="EFI"> <preferences profiles="EFI">
<type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_%OS_VERSION_ID%_KDE_Live" mediacheck="true"/> <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Jump_%OS_VERSION_ID%_KDE_Live" mediacheck="true"/>
<version>2.8.0</version> <version>2.8.0</version>
<bootloader-theme>openSUSE</bootloader-theme> <bootloader-theme>openSUSE</bootloader-theme>
<bootsplash-theme>bgrt</bootsplash-theme> <bootsplash-theme>bgrt</bootsplash-theme>
@ -23,7 +23,7 @@
<rpm-excludedocs>true</rpm-excludedocs> <rpm-excludedocs>true</rpm-excludedocs>
</preferences> </preferences>
<preferences profiles="noEFI"> <preferences profiles="noEFI">
<type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_%OS_VERSION_ID%_KDE_Live" mediacheck="true"/> <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Jump_%OS_VERSION_ID%_KDE_Live" mediacheck="true"/>
<version>2.8.0</version> <version>2.8.0</version>
<bootloader-theme>openSUSE</bootloader-theme> <bootloader-theme>openSUSE</bootloader-theme>
<bootsplash-theme>bgrt</bootsplash-theme> <bootsplash-theme>bgrt</bootsplash-theme>
@ -352,7 +352,6 @@
<package name="nano"/> <package name="nano"/>
<package name="ntfs-3g"/> <package name="ntfs-3g"/>
<package name="open-iscsi"/> <package name="open-iscsi"/>
<package name="pcmciautils"/>
<package name="pptp"/> <package name="pptp"/>
<package name="quota"/> <package name="quota"/>
<package name="reiserfs"/> <package name="reiserfs"/>
@ -388,6 +387,15 @@
<package name="xfsprogs"/> <package name="xfsprogs"/>
<package name="xz"/> <package name="xz"/>
<package name="yast2-trans-de"/> <package name="yast2-trans-de"/>
<package name="yast2-trans-cs"/>
<package name="yast2-trans-da"/>
<package name="yast2-trans-es"/>
<package name="yast2-trans-ja"/>
<package name="yast2-trans-pl"/>
<package name="yast2-trans-ru"/>
<package name="yast2-trans-sv"/>
<package name="yast2-trans-zh_CN"/>
<package name="yast2-trans-zh_TW"/>
<package name="zd1211-firmware"/> <package name="zd1211-firmware"/>
<package name="zip"/> <package name="zip"/>
<package name="aaa_base" replaces="ntp"/> <package name="aaa_base" replaces="ntp"/>

19
livecd-leap-x11.kiwi
View File

@ -2,7 +2,7 @@
<!-- OBS-ExclusiveArch: aarch64 i586 x86_64 --> <!-- OBS-ExclusiveArch: aarch64 i586 x86_64 -->
<image schemaversion="6.5" name="openSUSE-Leap-%OS_VERSION_ID%-Rescue-CD" displayname="openSUSE Leap %OS_VERSION_ID% Rescue CD"> <image schemaversion="6.5" name="openSUSE-Jump-%OS_VERSION_ID%-Rescue-CD" displayname="openSUSE Jump %OS_VERSION_ID% Rescue CD">
<description type="system"> <description type="system">
<author>openSUSE Project</author> <author>openSUSE Project</author>
<contact>opensuse@opensuse.org</contact> <contact>opensuse@opensuse.org</contact>
@ -13,7 +13,7 @@
<profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/> <profile name="EFI" description="EFI" import="true" arch="x86_64,aarch64"/>
</profiles> </profiles>
<preferences profiles="EFI"> <preferences profiles="EFI">
<type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_%OS_VERSION_ID%_Rescue_CD" mediacheck="true"/> <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Jump_%OS_VERSION_ID%_Rescue_CD" mediacheck="true"/>
<version>2.8.0</version> <version>2.8.0</version>
<bootloader-theme>openSUSE</bootloader-theme> <bootloader-theme>openSUSE</bootloader-theme>
<bootsplash-theme>bgrt</bootsplash-theme> <bootsplash-theme>bgrt</bootsplash-theme>
@ -23,7 +23,7 @@
<rpm-excludedocs>true</rpm-excludedocs> <rpm-excludedocs>true</rpm-excludedocs>
</preferences> </preferences>
<preferences profiles="noEFI"> <preferences profiles="noEFI">
<type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_%OS_VERSION_ID%_Rescue_CD" mediacheck="true"/> <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Jump_%OS_VERSION_ID%_Rescue_CD" mediacheck="true"/>
<version>2.8.0</version> <version>2.8.0</version>
<bootloader-theme>openSUSE</bootloader-theme> <bootloader-theme>openSUSE</bootloader-theme>
<bootsplash-theme>bgrt</bootsplash-theme> <bootsplash-theme>bgrt</bootsplash-theme>
@ -352,7 +352,6 @@
<package name="nano"/> <package name="nano"/>
<package name="ntfs-3g"/> <package name="ntfs-3g"/>
<package name="open-iscsi"/> <package name="open-iscsi"/>
<package name="pcmciautils"/>
<package name="pptp"/> <package name="pptp"/>
<package name="quota"/> <package name="quota"/>
<package name="reiserfs"/> <package name="reiserfs"/>
@ -388,6 +387,15 @@
<package name="xfsprogs"/> <package name="xfsprogs"/>
<package name="xz"/> <package name="xz"/>
<package name="yast2-trans-de"/> <package name="yast2-trans-de"/>
<package name="yast2-trans-cs"/>
<package name="yast2-trans-da"/>
<package name="yast2-trans-es"/>
<package name="yast2-trans-ja"/>
<package name="yast2-trans-pl"/>
<package name="yast2-trans-ru"/>
<package name="yast2-trans-sv"/>
<package name="yast2-trans-zh_CN"/>
<package name="yast2-trans-zh_TW"/>
<package name="zd1211-firmware"/> <package name="zd1211-firmware"/>
<package name="zip"/> <package name="zip"/>
<package name="aaa_base" replaces="ntp"/> <package name="aaa_base" replaces="ntp"/>
@ -480,11 +488,8 @@
<ignore name="accountsservice"/> <ignore name="accountsservice"/>
<package name="aaa_base" replaces="MozillaFirefox"/> <package name="aaa_base" replaces="MozillaFirefox"/>
<ignore name="MozillaFirefox"/> <ignore name="MozillaFirefox"/>
<package name="aaa_base" replaces="vim"/>
<ignore name="vim"/>
<package name="aaa_base" replaces="vim-data"/> <package name="aaa_base" replaces="vim-data"/>
<ignore name="vim-data"/> <ignore name="vim-data"/>
<package name="vim-small"/>
<package name="aaa_base" replaces="tcpdump"/> <package name="aaa_base" replaces="tcpdump"/>
<ignore name="tcpdump"/> <ignore name="tcpdump"/>
<package name="gparted"/> <package name="gparted"/>

9
livecd-openSUSE.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Sep 7 09:07:51 UTC 2020 - Fabian Vogt <fvogt@suse.com>
- Switch "leap" over to "Jump":
* Add back yast2-trans-*
* Don't replace vim with vim-small
- Drop pcmciautils
- Use set -eu in pre-checkin.sh
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 1 07:07:55 UTC 2020 - Dominique Leuenberger <dleuenberger@suse.com> Tue Sep 1 07:07:55 UTC 2020 - Dominique Leuenberger <dleuenberger@suse.com>

1
livecd-tumbleweed-gnome.kiwi
View File

@ -352,7 +352,6 @@
<package name="nano"/> <package name="nano"/>
<package name="ntfs-3g"/> <package name="ntfs-3g"/>
<package name="open-iscsi"/> <package name="open-iscsi"/>
<package name="pcmciautils"/>
<package name="pptp"/> <package name="pptp"/>
<package name="quota"/> <package name="quota"/>
<package name="reiserfs"/> <package name="reiserfs"/>

1
livecd-tumbleweed-kde.kiwi
View File

@ -352,7 +352,6 @@
<package name="nano"/> <package name="nano"/>
<package name="ntfs-3g"/> <package name="ntfs-3g"/>
<package name="open-iscsi"/> <package name="open-iscsi"/>
<package name="pcmciautils"/>
<package name="pptp"/> <package name="pptp"/>
<package name="quota"/> <package name="quota"/>
<package name="reiserfs"/> <package name="reiserfs"/>

5
livecd-tumbleweed-x11.kiwi
View File

@ -352,7 +352,6 @@
<package name="nano"/> <package name="nano"/>
<package name="ntfs-3g"/> <package name="ntfs-3g"/>
<package name="open-iscsi"/> <package name="open-iscsi"/>
<package name="pcmciautils"/>
<package name="pptp"/> <package name="pptp"/>
<package name="quota"/> <package name="quota"/>
<package name="reiserfs"/> <package name="reiserfs"/>
@ -480,10 +479,10 @@
<ignore name="accountsservice"/> <ignore name="accountsservice"/>
<package name="aaa_base" replaces="MozillaFirefox"/> <package name="aaa_base" replaces="MozillaFirefox"/>
<ignore name="MozillaFirefox"/> <ignore name="MozillaFirefox"/>
<package name="aaa_base" replaces="vim"/>
<ignore name="vim"/>
<package name="aaa_base" replaces="vim-data"/> <package name="aaa_base" replaces="vim-data"/>
<ignore name="vim-data"/> <ignore name="vim-data"/>
<package name="aaa_base" replaces="vim"/>
<ignore name="vim"/>
<package name="vim-small"/> <package name="vim-small"/>
<package name="aaa_base" replaces="tcpdump"/> <package name="aaa_base" replaces="tcpdump"/>
<ignore name="tcpdump"/> <ignore name="tcpdump"/>

1
livecd-tumbleweed-xfce.kiwi
View File

@ -352,7 +352,6 @@
<package name="nano"/> <package name="nano"/>
<package name="ntfs-3g"/> <package name="ntfs-3g"/>
<package name="open-iscsi"/> <package name="open-iscsi"/>
<package name="pcmciautils"/>
<package name="pptp"/> <package name="pptp"/>
<package name="quota"/> <package name="quota"/>
<package name="reiserfs"/> <package name="reiserfs"/>

27
pre-checkin.sh
View File

@ -1,7 +1,8 @@
#!/bin/sh #!/bin/sh
set -eu
install() { install() {
if [ -n "$2" ]; then if [ -n "${2-}" ]; then
PACKAGES="$PACKAGES\n <package name=\"$1\" arch=\"$2\"/>" PACKAGES="$PACKAGES\n <package name=\"$1\" arch=\"$2\"/>"
else else
PACKAGES="$PACKAGES\n <package name=\"$1\"/>" PACKAGES="$PACKAGES\n <package name=\"$1\"/>"
@ -13,7 +14,7 @@ buildignore() {
# but https://github.com/openSUSE/obs-build/issues/420 requires a workaround # but https://github.com/openSUSE/obs-build/issues/420 requires a workaround
## Due to "--ignoreignore--" this has no effect either, so workaround the workaround ## Due to "--ignoreignore--" this has no effect either, so workaround the workaround
## by using <ignore/>, which gets ignored by OBS completely... ## by using <ignore/>, which gets ignored by OBS completely...
if [ -n "$2" ]; then if [ -n "${2-}" ]; then
PACKAGES="$PACKAGES\n <package name=\"aaa_base\" replaces=\"$1\" arch=\"$2\"/>" PACKAGES="$PACKAGES\n <package name=\"aaa_base\" replaces=\"$1\" arch=\"$2\"/>"
PACKAGES="$PACKAGES\n <ignore name=\"$1\" arch=\"$2\"/>" PACKAGES="$PACKAGES\n <ignore name=\"$1\" arch=\"$2\"/>"
else else
@ -35,7 +36,7 @@ for distro in leap tumbleweed; do
bootsplash="bgrt" bootsplash="bgrt"
releaseprefix="openSUSE" releaseprefix="openSUSE"
if [ "${distro}" = "leap" ]; then if [ "${distro}" = "leap" ]; then
distroname="openSUSE Leap %OS_VERSION_ID%" distroname="openSUSE Jump %OS_VERSION_ID%"
# This changes every few weeks, apparently. # This changes every few weeks, apparently.
#releaseprefix="Leap" #releaseprefix="Leap"
fi fi
@ -43,18 +44,18 @@ for distro in leap tumbleweed; do
for flavor in gnome kde xfce x11; do for flavor in gnome kde xfce x11; do
uppercaseflavor="$(echo "${flavor}" | tr a-z A-Z)" uppercaseflavor="$(echo "${flavor}" | tr a-z A-Z)"
if [ "${flavor}" = "x11" ]; then if [ "${flavor}" = "x11" ]; then
name="${distroname} Rescue CD" name="${distroname} Rescue CD"
else else
name="${distroname} ${uppercaseflavor} Live" name="${distroname} ${uppercaseflavor} Live"
fi fi
PACKAGES="\n <!-- list-common.sh -->" PACKAGES="\n <!-- list-common.sh -->"
. "$PWD/list-common.sh" . "$PWD/list-common.sh"
PACKAGES="$PACKAGES\n\n <!-- list-${flavor}.sh -->" PACKAGES="$PACKAGES\n\n <!-- list-${flavor}.sh -->"
. "$PWD/list-${flavor}.sh" . "$PWD/list-${flavor}.sh"
[ "${flavor}" = "xfce" -a "${distro}" = "leap" ] && continue # Prevent creation of livecd-leap-xfce.kiwi [ "${flavor}" = "xfce" -a "${distro}" = "leap" ] && continue # Prevent creation of livecd-leap-xfce.kiwi
sed "s#@FLAVOR@#${flavor}#g;\ sed "s#@FLAVOR@#${flavor}#g;\
s#@NAME@#${name// /-}#g;\ s#@NAME@#${name// /-}#g;\
s#@DISPLAYNAME@#${name}#g;\ s#@DISPLAYNAME@#${name}#g;\