From 18dbfb3b5fabe7f0d47c132bceb79066b0198af4422415556a1347e8aee57341 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Thu, 27 Aug 2020 11:21:05 +0000 Subject: [PATCH] - issue-generator got fixed, so drop the workaround for RPi OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/kiwi-templates-JeOS?expand=0&rev=40 --- config.sh | 8 -------- kiwi-templates-JeOS.changes | 5 +++++ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/config.sh b/config.sh index 3c45f87..22b8130 100644 --- a/config.sh +++ b/config.sh @@ -126,14 +126,6 @@ sed -i 's/.*solver.onlyRequires.*/solver.onlyRequires = true/g' /etc/zypp/zypp.c #-------------------------------------- sed -i 's/.*rpm.install.excludedocs.*/rpm.install.excludedocs = yes/g' /etc/zypp/zypp.conf -#====================================== -# Configure Raspberry Pi specifics -#-------------------------------------- -if [[ "$kiwi_profiles" == *"RaspberryPi"* ]]; then - # 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]' -fi - # Not compatible with set -e baseCleanMount || true diff --git a/kiwi-templates-JeOS.changes b/kiwi-templates-JeOS.changes index 518c8df..459f332 100644 --- a/kiwi-templates-JeOS.changes +++ b/kiwi-templates-JeOS.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 27 11:19:26 UTC 2020 - Fabian Vogt + +- issue-generator got fixed, so drop the workaround for RPi + ------------------------------------------------------------------- Thu Aug 27 10:28:32 UTC 2020 - Fabian Vogt