pool/kiwi-templates-JeOS
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/818097
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kiwi-templates-JeOS?expand=0&rev=15
This commit is contained in:
Dominique Leuenberger 2020-07-02 21:56:27 +00:00 committed by Git OBS Bridge
commit 12395a8782
3 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
JeOS.kiwi
View File

@ -18,7 +18,6 @@
<preferences profiles="kvm-and-xen">
<version>15.1.0</version>
<packagemanager>zypper</packagemanager>
<bootsplash-theme>openSUSE</bootsplash-theme>
<bootloader-theme>openSUSE</bootloader-theme>
<rpm-excludedocs>true</rpm-excludedocs>
<type
@ -53,7 +52,6 @@
<preferences profiles="VMware">
<version>15.1.0</version>
<packagemanager>zypper</packagemanager>
<bootsplash-theme>openSUSE</bootsplash-theme>
<bootloader-theme>openSUSE</bootloader-theme>
<rpm-excludedocs>true</rpm-excludedocs>
<type
@ -89,7 +87,6 @@
<preferences profiles="OpenStack-Cloud">
<version>15.1.0</version>
<packagemanager>zypper</packagemanager>
<bootsplash-theme>openSUSE</bootsplash-theme>
<bootloader-theme>openSUSE</bootloader-theme>
<rpm-excludedocs>true</rpm-excludedocs>
<type
@ -110,7 +107,6 @@
<preferences profiles="MS-HyperV">
<version>15.1.0</version>
<packagemanager>zypper</packagemanager>
<bootsplash-theme>openSUSE</bootsplash-theme>
<bootloader-theme>openSUSE</bootloader-theme>
<rpm-excludedocs>true</rpm-excludedocs>
<type
@ -146,7 +142,6 @@
<preferences profiles="RaspberryPi">
<version>15.1.0</version>
<packagemanager>zypper</packagemanager>
<bootsplash-theme>openSUSE</bootsplash-theme>
<bootloader-theme>openSUSE</bootloader-theme>
<rpm-excludedocs>true</rpm-excludedocs>
<type

20
config.sh
View File

@ -85,10 +85,6 @@ if [ -x /usr/sbin/firewalld ]; then
systemctl enable firewalld.service
fi
# Set GRUB2 to boot graphically (bsc#1097428)
sed -Ei"" "s/#?GRUB_TERMINAL=.+$/GRUB_TERMINAL=gfxterm/g" /etc/default/grub
sed -Ei"" "s/#?GRUB_GFXMODE=.+$/GRUB_GFXMODE=auto/g" /etc/default/grub
#======================================
# Add repos from control.xml
#--------------------------------------
@ -134,22 +130,8 @@ sed -i 's/.*rpm.install.excludedocs.*/rpm.install.excludedocs = yes/g' /etc/zypp
# Configure Raspberry Pi specifics
#--------------------------------------
if [[ "$kiwi_profiles" == *"RaspberryPi"* ]]; then
# Also show WLAN interfaces in /etc/issue
# Also show WLAN interfaces in /etc/issue. Remove once https://github.com/thkukuk/issue-generator/pull/4 accepted
baseUpdateSysConfig /etc/sysconfig/issue-generator NETWORK_INTERFACE_REGEX '^[bew]'
# Add necessary kernel modules to initrd (will disappear with bsc#1084272)
echo 'add_drivers+=" bcm2835_dma dwc2 "' > /etc/dracut.conf.d/raspberrypi_modules.conf
# Work around network issues
cat > /etc/modprobe.d/50-rpi3.conf <<-EOF
# Prevent too many page allocations (bsc#1012449)
options smsc95xx turbo_mode=N
EOF
cat > /usr/lib/sysctl.d/50-rpi3.conf <<-EOF
# Avoid running out of DMA pages for smsc95xx (bsc#1012449)
vm.min_free_kbytes = 2048
EOF
fi
# Not compatible with set -e

8
kiwi-templates-JeOS.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Jun 30 13:37:54 UTC 2020 - Fabian Vogt <fvogt@suse.com>
- Drop bootsplash-theme, not used
- Don't touch /etc/default/grub in config.sh, kiwi overwrites it
anyway
- RPi workarounds are part of the raspberrypi-firmware package now
-------------------------------------------------------------------
Mon May 18 08:16:29 UTC 2020 - Fabian Vogt <fvogt@suse.com>