diff --git a/config.sh b/config.sh index c348c82..b36e54b 100644 --- a/config.sh +++ b/config.sh @@ -81,6 +81,13 @@ zypper --non-interactive rm -u skelcd-openSUSE || : # Remove the zypper locks needed for a slimmer system zypper rl $(seq 1 $(zypper ll | wc -l)) +if [ "$desktop" = "xfce" ]; then + # Change /control.xml to use xfce as system role + xsltproc /xfce-changecontrolxml.xsl /etc/YaST2/control.xml > /control.xml + # Not needed anymore + rm /xfce-changecontrolxml.xsl +fi + #====================================== # /etc/sudoers hack to fix #297695 # (Installation Live CD: no need to ask for password of root) @@ -106,6 +113,14 @@ if [ "$desktop" = "kde" ]; then # Set the application as being "trusted" chmod a+x /usr/share/kio_desktop/DesktopLinks/installation.desktop chmod a+x /usr/share/kio_desktop/DesktopLinks/upgrade.desktop || : +elif [ "$desktop" = "xfce" ]; then + # Add Installation icon to desktop folder + mkdir -p /home/linux/.config /home/linux/Desktop + echo 'XDG_DESKTOP_DIR="$HOME/Desktop"' > /home/linux/.config/user-dirs.dirs + cp /usr/share/applications/installation.desktop /home/linux/Desktop/ + # Set the application as being "trusted" + chown -R linux /home/linux/Desktop/installation.desktop + chmod a+x /home/linux/Desktop/installation.desktop # else case disabled: 'x11' (rescue) does not contain the installer, GNOME Shell has no concept of 'desktop' #else # # Add Installation icon to desktop folder @@ -133,6 +148,7 @@ baseUpdateSysConfig /etc/sysconfig/console CONSOLE_ENCODING "UTF-8" [ "$desktop" = "gnome" ] && displaymanager=gdm [ "$desktop" = "kde" ] && displaymanager=sddm +[ "$desktop" = "xfce" ] && displaymanager=lightdm [ "$desktop" = "x11" ] && displaymanager=lightdm baseUpdateSysConfig /etc/sysconfig/displaymanager DISPLAYMANAGER $displaymanager diff --git a/list-xfce.sh b/list-xfce.sh new file mode 100644 index 0000000..51aff20 --- /dev/null +++ b/list-xfce.sh @@ -0,0 +1,49 @@ +install branding-openSUSE +buildignore samba-libs +install yast2-trans-stats +install patterns-media-rest_cd_x11 +installPattern rest_cd_x11 +install patterns-xfce-xfce +installPattern xfce +install openSUSE-release-livecd-xfce +buildignore release-notes-openSUSE +buildignore gnome-themes-accessibility +buildignore xlockmore +buildignore unzip-doc +buildignore gtk2-immodule-inuktitut +buildignore gtk2-immodule-thai +buildignore gtk2-immodule-vietnamese +buildignore gtk3-immodule-inuktitut +buildignore gtk3-immodule-thai +buildignore gtk3-immodule-vietnamese +buildignore ImageMagick +buildignore awesfx +buildignore sbl +buildignore open-vm-tools +buildignore gnome-online-accounts +buildignore snapper +install live-net-installer +install skelcd-openSUSE # Needed for README.BETA +install setxkbmap # Needed by yast2-keyboard +install yast2-qt-branding-openSUSE +buildignore aspell-en +buildignore avahi +buildignore fprintd +install libxslt-tools +archive xfce-changecontrolxml.tar.xz + +# Remove xfce pattern bloat +buildignore sound-juicer +buildignore remmina +buildignore gnome-games + +# Remove useless xfce panel plugins +buildignore xfce4-panel-plugin-xkb +buildignore xfce4-panel-plugin-notes + +# Remove Libreoffice as it's too big +buildignore libreoffice + +# PackageKit is not needed +buildignore PackageKit +buildignore PackageKit-gstreamer-plugin \ No newline at end of file diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes index e656bbb..df1c7d8 100644 --- a/livecd-openSUSE.changes +++ b/livecd-openSUSE.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Wed Mar 6 13:24:11 UTC 2019 - Maurizio Galli + +- Prevent creation of livecd-leap-xfce.kiwi in pre-checkin.sh +- Removed white spaces in pre-checkin.sh + +------------------------------------------------------------------- +Wed Mar 6 09:16:09 UTC 2019 - Maurizio Galli + +- Fixed indendation in config.sh +- Temporarily removed live-leap-xfce.kiwi +- Added Xfce System Role to installer as option via xfce-changecontrolxml.xsl + +------------------------------------------------------------------- +Sat Mar 2 18:07:22 UTC 2019 - Maurizio Galli + +- Added config and files for the installer to use Xfce System Role + +------------------------------------------------------------------- +Sat Mar 2 06:40:53 UTC 2019 - Maurizio Galli + +- Added Xfce TW Live Image kiwi file and related configs + ------------------------------------------------------------------- Mon Feb 18 14:50:30 UTC 2019 - Fabian Vogt diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi new file mode 100644 index 0000000..ba4a6d1 --- /dev/null +++ b/livecd-tumbleweed-xfce.kiwi @@ -0,0 +1,388 @@ + + + + openSUSE Project + opensuse@opensuse.org + openSUSE Live system + + + + + + + + 2.8.0 + openSUSE + openSUSE + zypper + false + en_US + true + + + + 2.8.0 + openSUSE + openSUSE + zypper + false + en_US + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pre-checkin.sh b/pre-checkin.sh index 8c4c7a5..84c7b33 100644 --- a/pre-checkin.sh +++ b/pre-checkin.sh @@ -26,30 +26,35 @@ installPattern() { PACKAGES="$PACKAGES\n " } +archive() { + PACKAGES="$PACKAGES\n " +} + for distro in leap tumbleweed; do distroname="openSUSE Tumbleweed" if [ "${distro}" = "leap" ]; then distroname="openSUSE Leap 15.1" fi - for flavor in gnome kde x11; do + for flavor in gnome kde xfce x11; do uppercaseflavor="$(echo "${flavor}" | tr a-z A-Z)" - if [ "${flavor}" = "x11" ]; then - name="${distroname} Rescue CD" - else - name="${distroname} ${uppercaseflavor} Live" - fi - - PACKAGES="\n " - . "$PWD/list-common.sh" - PACKAGES="$PACKAGES\n\n " - . "$PWD/list-${flavor}.sh" + if [ "${flavor}" = "x11" ]; then + name="${distroname} Rescue CD" + else + name="${distroname} ${uppercaseflavor} Live" + fi + PACKAGES="\n " + . "$PWD/list-common.sh" + PACKAGES="$PACKAGES\n\n " + . "$PWD/list-${flavor}.sh" + + [ "${flavor}" = "xfce" -a "${distro}" = "leap" ] && continue # Prevent creation of livecd-leap-xfce.kiwi sed "s#@FLAVOR@#${flavor}#g;\ - s#@NAME@#${name// /-}#g;\ - s#@DISPLAYNAME@#${name}#g;\ - s#@VOLID@#${name// /_}#g;\ - s#@PACKAGES@#${PACKAGES}#g;" livecd.kiwi.in > livecd-${distro}-${flavor}.kiwi + s#@NAME@#${name// /-}#g;\ + s#@DISPLAYNAME@#${name}#g;\ + s#@VOLID@#${name// /_}#g;\ + s#@PACKAGES@#${PACKAGES}#g;" livecd.kiwi.in > livecd-${distro}-${flavor}.kiwi done done diff --git a/xfce-changecontrolxml.tar.xz b/xfce-changecontrolxml.tar.xz new file mode 100644 index 0000000..8dcfc4d --- /dev/null +++ b/xfce-changecontrolxml.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee33ef05e615eae12bf21c08667655863ae660c16f1e1219b01a1dd8a8b23276 +size 796