From 734f1c20506302f780a5fd6bd4f26eabb2f501bb Mon Sep 17 00:00:00 2001 From: mudler Date: Fri, 10 Jun 2016 23:30:24 +0200 Subject: [PATCH] Generate also LXQt spin, with a minimum package set --- molecules/lxqt.common | 125 ++++++++++++++++++ molecules/sabayon-amd64-lxqt-dev.spec | 9 ++ molecules/sabayon-amd64-lxqt.spec | 9 ++ scripts/iso_build.sh | 7 + ...aster_generic_inner_chroot_script_after.sh | 7 + 5 files changed, 157 insertions(+) create mode 100644 molecules/lxqt.common create mode 100644 molecules/sabayon-amd64-lxqt-dev.spec create mode 100644 molecules/sabayon-amd64-lxqt.spec diff --git a/molecules/lxqt.common b/molecules/lxqt.common new file mode 100644 index 0000000..64ee1ef --- /dev/null +++ b/molecules/lxqt.common @@ -0,0 +1,125 @@ +# Define an alternative execution strategy, in this case, the value must be +# "iso_remaster" +execution_strategy: iso_remaster + +# Release string +release_string: Sabayon Linux + +# File to write release string +release_file: /etc/sabayon-edition + +# ISO Image title +iso_title: Sabayon LXQt + +# Enable XZ compression in mksquashfs +extra_mksquashfs_parameters: -comp xz -Xbcj x86 + +# Outer chroot script command, to be executed outside destination chroot before +# before entering it (and before inner_chroot_script) +%env outer_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_pre.sh + +# Execute repositories update here, in a more fault-tolerant flavor +%env inner_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_generic_inner_chroot_script.sh + +# Inner chroot script command, to be executed inside destination chroot after +# packages installation and removal +%env inner_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_generic_inner_chroot_script_after.sh lxqt + +# Outer chroot script command, to be executed outside destination chroot before +# before entering it (and AFTER inner_chroot_script) +%env outer_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_post.sh + +# Used to umount /proc and unbind packages dir +%env error_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_error_script.sh + +# Pre-ISO building script. Hook to be able to copy kernel images in place, for example +%env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh lxqt + +# Destination directory for the ISO image path (MANDATORY) +%env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso + +# List of packages that would be removed from chrooted system (comma separated) +# packages_to_remove: + +# Import the Graphic Environment module. +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/graphic-environment.common + +# List of packages that would be added from chrooted system (comma separated) +packages_to_add: + @gst-plugins, + @gst-plugins-extra, + @wireless, + app-admin/packagekit-base, + app-admin/packagekit-qt4, + app-admin/rigo, + app-crypt/gnupg, + app-crypt/pinentry-qt4, + app-dicts/aspell-de, + app-dicts/aspell-en, + app-dicts/aspell-fr, + app-dicts/aspell-it, + app-dicts/aspell-nl, + app-dicts/aspell-pl, + app-dicts/myspell-de, + app-dicts/myspell-en, + app-dicts/myspell-es, + app-dicts/myspell-fr, + app-dicts/myspell-it, + app-dicts/myspell-nl, + app-misc/calamares-sabayon, + app-misc/sabayon-skel, + app-misc/sabayon-version, + app-text/pastebunz, + games-misc/cowsay, + lxqt-base/lxqt-meta, + net-dialup/globespan-adsl, + net-dialup/ppp, + net-dialup/rp-pppoe, + net-misc/networkmanager, + net-misc/networkmanager-openvpn, + net-misc/networkmanager-pptp, + net-misc/networkmanager-vpnc, + net-misc/ntp, + net-print/cups, + sys-apps/hdparm, + sys-apps/sdparm, + sys-apps/tuxonice-userui, + sys-auth/polkit, + sys-auth/polkit-qt, + sys-block/parted, + sys-block/partitionmanager, + sys-fs/dmraid, + sys-fs/ntfs3g, + sys-power/acpid, + sys-power/cpupower, + www-client/google-chrome, + x11-apps/xdm, + x11-libs/libva-intel-driver, + x11-libs/libva-vdpau-driver, + x11-misc/sddm, + x11-misc/xvkbd, + x11-themes/oxygen-gtk:2, + x11-themes/oxygen-gtk:3, + x11-themes/sabayon-artwork-core, + x11-themes/sabayon-artwork-extra, + x11-themes/sabayon-artwork-grub, + x11-themes/sabayon-artwork-loo, + x11-themes/sound-theme-freedesktop, + x11-themes/xcursor-themes, + x11-wm/twm + +# Custom shell call to packages add (default is: equo install) +# custom_packages_add_cmd: + +# Custom command for updating repositories (default is: equo update) +# repositories_update_cmd: + +# Determine whether repositories update should be run (if packages_to_add is set) +# (default is: no), values are: yes, no. +execute_repositories_update: no + +# Directories to remove completely (comma separated) +# paths_to_remove: + +# Directories to empty (comma separated) +# paths_to_empty: diff --git a/molecules/sabayon-amd64-lxqt-dev.spec b/molecules/sabayon-amd64-lxqt-dev.spec new file mode 100644 index 0000000..3a5c16c --- /dev/null +++ b/molecules/sabayon-amd64-lxqt-dev.spec @@ -0,0 +1,9 @@ +# Use abs path, otherwise daily builds automagic won't work +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/lxqt.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/amd64.common + +%env release_version: ${SABAYON_RELEASE:-LATEST} +release_desc: amd64 LXQt Development + +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_${ISO_TAG:-LATEST}_amd64_SpinBase-dev.iso +%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-LATEST}_amd64_LXQt-dev.iso diff --git a/molecules/sabayon-amd64-lxqt.spec b/molecules/sabayon-amd64-lxqt.spec new file mode 100644 index 0000000..2c36f58 --- /dev/null +++ b/molecules/sabayon-amd64-lxqt.spec @@ -0,0 +1,9 @@ +# Use abs path, otherwise daily builds automagic won't work +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/lxqt.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/amd64.common + +%env release_version: ${SABAYON_RELEASE:-LATEST} +release_desc: amd64 LXQt + +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_${ISO_TAG:-LATEST}_amd64_SpinBase.iso +%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-LATEST}_amd64_LXQt.iso diff --git a/scripts/iso_build.sh b/scripts/iso_build.sh index 6fffeba..daed667 100755 --- a/scripts/iso_build.sh +++ b/scripts/iso_build.sh @@ -84,6 +84,7 @@ if [ "${ACTION}" = "weekly" ] || [ "${ACTION}" = "daily" ]; then "sabayon-amd64-xfce.spec" "sabayon-amd64-minimal.spec" "sabayon-amd64-server.spec" + "sabayon-amd64-lxqt.spec" "sabayon-amd64-gnome-dev.spec" "sabayon-amd64-kde-dev.spec" @@ -91,6 +92,8 @@ if [ "${ACTION}" = "weekly" ] || [ "${ACTION}" = "daily" ]; then "sabayon-amd64-xfce-dev.spec" "sabayon-amd64-minimal-dev.spec" "sabayon-amd64-server-dev.spec" + "sabayon-amd64-lxqt-dev.spec" + ) REMASTER_SPECS_ISO+=( "${DISTRO_NAME}_${ISO_TAG}_amd64_GNOME.iso" @@ -99,6 +102,7 @@ if [ "${ACTION}" = "weekly" ] || [ "${ACTION}" = "daily" ]; then "${DISTRO_NAME}_${ISO_TAG}_amd64_Xfce.iso" "${DISTRO_NAME}_${ISO_TAG}_amd64_Minimal.iso" "${DISTRO_NAME}_${ISO_TAG}_amd64_Server.iso" + "${DISTRO_NAME}_${ISO_TAG}_amd64_LXQt.iso" "${DISTRO_NAME}_${ISO_TAG}_amd64_GNOME-dev.iso" "${DISTRO_NAME}_${ISO_TAG}_amd64_KDE-dev.iso" @@ -106,6 +110,7 @@ if [ "${ACTION}" = "weekly" ] || [ "${ACTION}" = "daily" ]; then "${DISTRO_NAME}_${ISO_TAG}_amd64_Xfce-dev.iso" "${DISTRO_NAME}_${ISO_TAG}_amd64_Minimal-dev.iso" "${DISTRO_NAME}_${ISO_TAG}_amd64_Server-dev.iso" + "${DISTRO_NAME}_${ISO_TAG}_amd64_LXQt-dev.iso" ) REMASTER_TAR_SPECS+=( "sabayon-amd64-spinbase-tarball-template.spec" @@ -174,6 +179,7 @@ elif [ "${ACTION}" = "monthly" ] || [ "${ACTION}" = "release" ]; then "sabayon-amd64-xfce.spec" "sabayon-amd64-minimal.spec" "sabayon-amd64-server.spec" + "sabayon-amd64-lxqt.spec" ) REMASTER_SPECS_ISO+=( "${DISTRO_NAME}_${ISO_TAG}_amd64_GNOME.iso" @@ -182,6 +188,7 @@ elif [ "${ACTION}" = "monthly" ] || [ "${ACTION}" = "release" ]; then "${DISTRO_NAME}_${ISO_TAG}_amd64_Xfce.iso" "${DISTRO_NAME}_${ISO_TAG}_amd64_Minimal.iso" "${DISTRO_NAME}_${ISO_TAG}_amd64_Server.iso" + "${DISTRO_NAME}_${ISO_TAG}_amd64_LXQt.iso" ) REMASTER_TAR_SPECS+=( "sabayon-amd64-spinbase-tarball-template.spec" diff --git a/scripts/remaster_generic_inner_chroot_script_after.sh b/scripts/remaster_generic_inner_chroot_script_after.sh index a86474a..561f874 100755 --- a/scripts/remaster_generic_inner_chroot_script_after.sh +++ b/scripts/remaster_generic_inner_chroot_script_after.sh @@ -317,6 +317,11 @@ prepare_lxde() { sed -i 's/pcmanfm -d/pcmanfm -d --desktop/g' /etc/xdg/lxsession/LXDE/autostart } +prepare_lxqt() { + setup_default_xsession "lxqt" + +} + prepare_mate() { setup_default_xsession "mate" } @@ -391,6 +396,8 @@ prepare_system() { prepare_xfceforensic elif [ "${de}" = "kde" ]; then prepare_kde + elif [ "${de}" = "lxqt" ]; then + prepare_lxqt elif [ "${de}" = "awesome" ]; then prepare_awesome fi