From e998593c27d1ce97dbf0ce10f3610ae3d323c705 Mon Sep 17 00:00:00 2001 From: KJS Date: Sat, 11 Aug 2018 10:45:45 +0000 Subject: [PATCH] Update forensicxfce.common --- .../{forensicxfce.common => forensic.common} | 51 +------------------ molecules/mate.common | 2 +- ...pec => sabayon-amd64-gnome-forensics.spec} | 5 +- scripts/iso_build.sh | 2 +- scripts/sabayon_iso_build.sh | 2 +- scripts/xfce_remaster_post.sh | 3 -- 6 files changed, 8 insertions(+), 57 deletions(-) rename molecules/{forensicxfce.common => forensic.common} (54%) rename molecules/{sabayon-amd64-xfceforensic.spec => sabayon-amd64-gnome-forensics.spec} (80%) diff --git a/molecules/forensicxfce.common b/molecules/forensic.common similarity index 54% rename from molecules/forensicxfce.common rename to molecules/forensic.common index 19309be..3bb0fa0 100644 --- a/molecules/forensicxfce.common +++ b/molecules/forensic.common @@ -1,52 +1,22 @@ -# 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 Forensics Gnome -# Enable XZ compression in mksquashfs -extra_mksquashfs_parameters: -comp xz - -# 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 xfceforensic - # 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/xfce_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/xfceforensic_pre_iso_script.sh -# 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: - x11-wm/fluxbox, games-misc/cowsay, games-action/minetest_game, dev-python/wxpython, media-video/pitivi + games-action/minetest, + dev-python/wxpython - # List of packages that would be added from chrooted system (comma separated) packages_to_add: app-admin/testdisk, @@ -60,12 +30,10 @@ packages_to_add: app-forensics/mac-robber, app-forensics/memdump, app-forensics/aide, - app-forensics/rdd, app-forensics/rifiuti-20040505_p1, app-forensics/unhide-20130526, app-crypt/chntpw, app-crypt/fcrackzip, - app-crypt/hashcat-bin, app-crypt/johntheripper, app-crypt/gifshuffle, app-crypt/pdfcrack, @@ -112,19 +80,4 @@ packages_to_add: x11-terms/gnome-terminal, x11-themes/gtk-engines-murrine, x11-wm/awesome, - -# 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/mate.common b/molecules/mate.common index b06fbc1..db01a93 100644 --- a/molecules/mate.common +++ b/molecules/mate.common @@ -52,7 +52,7 @@ packages_to_add: app-misc/sabayon-greeter, app-editors/atom, app-crypt/pinentry-gtk2, - app-misc/calamares-sabayon, + app-misc/calamares-sabayon, app-text/pastebunz, app-office/libreoffice, games-action/minetest_game, diff --git a/molecules/sabayon-amd64-xfceforensic.spec b/molecules/sabayon-amd64-gnome-forensics.spec similarity index 80% rename from molecules/sabayon-amd64-xfceforensic.spec rename to molecules/sabayon-amd64-gnome-forensics.spec index 8950fb3..db93181 100644 --- a/molecules/sabayon-amd64-xfceforensic.spec +++ b/molecules/sabayon-amd64-gnome-forensics.spec @@ -1,5 +1,6 @@ # Use abs path, otherwise daily builds automagic won't work -%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/forensicxfce.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/gnome.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/forensic.common %env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/amd64.common # Release Version @@ -9,6 +10,6 @@ release_desc: amd64 ForensicsGnome # Path to source ISO file (MANDATORY) -%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_${ISO_TAG:-LATEST}_amd64_GNOME.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_${ISO_TAG:-LATEST}_amd64_SpinBase.iso destination_iso_image_name: Sabayon_Linux_DAILY_amd64_ForensicsGnome.iso diff --git a/scripts/iso_build.sh b/scripts/iso_build.sh index 4b9be43..761795d 100755 --- a/scripts/iso_build.sh +++ b/scripts/iso_build.sh @@ -177,7 +177,7 @@ prepare_env () { # Weekly molecules if [ "${ACTION}" = "weekly" ]; then - REMASTER_SPECS+=( "sabayon-amd64-xfceforensic.spec" ) + REMASTER_SPECS+=( "sabayon-amd64-gnome-forensics.spec" ) REMASTER_SPECS_ISO+=( "${DISTRO_NAME}_${ISO_TAG}_amd64_ForensicsGnome.iso" ) fi diff --git a/scripts/sabayon_iso_build.sh b/scripts/sabayon_iso_build.sh index b752e57..524510f 100755 --- a/scripts/sabayon_iso_build.sh +++ b/scripts/sabayon_iso_build.sh @@ -191,7 +191,7 @@ prepare_env () { # Weekly molecules if [ "${ACTION}" = "weekly" ]; then - REMASTER_SPECS+=( "sabayon-amd64-xfceforensic.spec" ) + REMASTER_SPECS+=( "sabayon-amd64-gnome-forensics.spec" ) REMASTER_SPECS_ISO+=( "${DISTRO_NAME}_${ISO_TAG}_amd64_ForensicsGnome.iso" ) fi diff --git a/scripts/xfce_remaster_post.sh b/scripts/xfce_remaster_post.sh index f63e898..32060dc 100755 --- a/scripts/xfce_remaster_post.sh +++ b/scripts/xfce_remaster_post.sh @@ -4,9 +4,6 @@ SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}" export SABAYON_MOLECULE_HOME -# execute parent script -"${SABAYON_MOLECULE_HOME}"/scripts/remaster_post.sh - GFORENSIC_DIR="${SABAYON_MOLECULE_HOME}/remaster/gforensic" # setup skel and background cp "${GFORENSIC_DIR}"/usr/share/backgrounds/sabayon-forensic.png "${CHROOT_DIR}/usr/share/backgrounds/"