From 68d24583fa314fc835f12f875a1da9ec967f7edd Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Tue, 11 Sep 2012 15:55:58 +0200 Subject: [PATCH] [molecules] enable mksquashfs XZ compression (cross fingers wrt rsync) --- molecules/awesome.common | 3 +++ molecules/corecdx.common | 3 +++ molecules/e17.common | 3 +++ molecules/forensicxfce.common | 3 +++ molecules/gaming.common | 3 +++ molecules/gnome.common | 3 +++ molecules/hardenedserver.common | 3 +++ molecules/kde.common | 3 +++ molecules/lxde.common | 3 +++ molecules/mate.common | 3 +++ molecules/serverbase.common | 3 +++ molecules/spinbase.common | 3 +++ molecules/xfce.common | 3 +++ 13 files changed, 39 insertions(+) diff --git a/molecules/awesome.common b/molecules/awesome.common index 6c3203e..8b14e23 100644 --- a/molecules/awesome.common +++ b/molecules/awesome.common @@ -8,6 +8,9 @@ release_string: Sabayon Linux # File to write release string release_file: /etc/sabayon-edition +# Enable XZ compression in mksquashfs +extra_mksquashfs_parameters: -comp xz -Xbcj x86 + # ISO Image title iso_title: Sabayon Awesome diff --git a/molecules/corecdx.common b/molecules/corecdx.common index c1e3008..7f6bc76 100644 --- a/molecules/corecdx.common +++ b/molecules/corecdx.common @@ -11,6 +11,9 @@ release_string: Sabayon Linux # File to write release string release_file: /etc/sabayon-edition +# 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 diff --git a/molecules/e17.common b/molecules/e17.common index c1d7a23..6616558 100644 --- a/molecules/e17.common +++ b/molecules/e17.common @@ -11,6 +11,9 @@ release_file: /etc/sabayon-edition # ISO Image title iso_title: Sabayon E17 +# 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 diff --git a/molecules/forensicxfce.common b/molecules/forensicxfce.common index 29053e4..1a4b8b8 100644 --- a/molecules/forensicxfce.common +++ b/molecules/forensicxfce.common @@ -11,6 +11,9 @@ release_file: /etc/sabayon-edition # ISO Image title iso_title: Sabayon Forensics Xfce +# 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 diff --git a/molecules/gaming.common b/molecules/gaming.common index 86902b6..dc2fa6b 100644 --- a/molecules/gaming.common +++ b/molecules/gaming.common @@ -11,6 +11,9 @@ release_file: /etc/sabayon-edition # ISO Image title iso_title: Sabayon Gaming Edition +# 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 diff --git a/molecules/gnome.common b/molecules/gnome.common index 31654d9..ed9ccde 100644 --- a/molecules/gnome.common +++ b/molecules/gnome.common @@ -11,6 +11,9 @@ release_file: /etc/sabayon-edition # ISO Image title iso_title: Sabayon GNOME +# 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 diff --git a/molecules/hardenedserver.common b/molecules/hardenedserver.common index 69a644e..44187be 100644 --- a/molecules/hardenedserver.common +++ b/molecules/hardenedserver.common @@ -11,6 +11,9 @@ release_string: Sabayon Linux # File to write release string release_file: /etc/sabayon-edition +# 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 diff --git a/molecules/kde.common b/molecules/kde.common index 1be107b..7dcc198 100644 --- a/molecules/kde.common +++ b/molecules/kde.common @@ -11,6 +11,9 @@ release_file: /etc/sabayon-edition # ISO Image title iso_title: Sabayon KDE +# 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 diff --git a/molecules/lxde.common b/molecules/lxde.common index 9639a11..61448e3 100644 --- a/molecules/lxde.common +++ b/molecules/lxde.common @@ -11,6 +11,9 @@ release_file: /etc/sabayon-edition # ISO Image title iso_title: Sabayon LXDE +# 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 diff --git a/molecules/mate.common b/molecules/mate.common index 071812b..e112890 100644 --- a/molecules/mate.common +++ b/molecules/mate.common @@ -11,6 +11,9 @@ release_file: /etc/sabayon-edition # ISO Image title iso_title: Sabayon MATE +# 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 diff --git a/molecules/serverbase.common b/molecules/serverbase.common index 10596b5..0ab70d0 100644 --- a/molecules/serverbase.common +++ b/molecules/serverbase.common @@ -11,6 +11,9 @@ release_string: Sabayon Linux # File to write release string release_file: /etc/sabayon-edition +# 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 diff --git a/molecules/spinbase.common b/molecules/spinbase.common index 8d8e2b9..b2399ef 100644 --- a/molecules/spinbase.common +++ b/molecules/spinbase.common @@ -14,6 +14,9 @@ release_file: /etc/sabayon-edition # Extra mirror (r)sync parameters extra_rsync_parameters: --one-file-system +# Enable XZ compression in mksquashfs +extra_mksquashfs_parameters: -comp xz -Xbcj x86 + # Inner chroot script command, to be executed inside destination chroot before packing it # - kmerge.sh - setup kernel bins # %env inner_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/inner_chroot_script.sh diff --git a/molecules/xfce.common b/molecules/xfce.common index e51436c..87177be 100644 --- a/molecules/xfce.common +++ b/molecules/xfce.common @@ -11,6 +11,9 @@ release_file: /etc/sabayon-edition # ISO Image title iso_title: Sabayon Xfce +# 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