From cadeced8818b04d430170aa1407b487879e7fa61 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sun, 18 Apr 2010 13:44:34 +0200 Subject: [PATCH] [specs] update .spec example files --- examples/specs/4-amd64-g.spec | 150 --------------------------------- examples/specs/4-amd64-k.spec | 150 --------------------------------- examples/specs/4-x86-g.spec | 153 ---------------------------------- examples/specs/4-x86-k.spec | 153 ---------------------------------- examples/specs/5-amd64-g.spec | 43 +++++----- examples/specs/5-amd64-k.spec | 43 +++++----- examples/specs/5-x86-g.spec | 43 +++++----- examples/specs/5-x86-k.spec | 43 +++++----- 8 files changed, 84 insertions(+), 694 deletions(-) delete mode 100755 examples/specs/4-amd64-g.spec delete mode 100755 examples/specs/4-amd64-k.spec delete mode 100755 examples/specs/4-x86-g.spec delete mode 100755 examples/specs/4-x86-k.spec mode change 100755 => 100644 examples/specs/5-amd64-g.spec mode change 100755 => 100644 examples/specs/5-amd64-k.spec mode change 100755 => 100644 examples/specs/5-x86-g.spec mode change 100755 => 100644 examples/specs/5-x86-k.spec diff --git a/examples/specs/4-amd64-g.spec b/examples/specs/4-amd64-g.spec deleted file mode 100755 index ce7f420..0000000 --- a/examples/specs/4-amd64-g.spec +++ /dev/null @@ -1,150 +0,0 @@ -# Sabayon Linux 4 amd64 Molecule spec file -# squashfs, mkisofs needed - -# Define an alternative execution strategy, in this case, the value must be -# "livecd" -# execution_strategy: livecd - -# pre chroot command, example, for 32bit chroots on 64bit system, you always have to append "linux32" -# this is useful for inner_chroot_script -# prechroot: - -# Release string -release_string: Sabayon Linux - -# Release Version -release_version: 4.1RC1 - -# Release Version string description -release_desc: amd64 G - -# Release file (inside chroot) -release_file: /etc/sabayon-edition - -# Source chroot directory, where files are pulled from -source_chroot: /sabayon/sources/amd64_gnome-2009 - -# Destination chroot directory, where files are pushed to before creating the squashfs image -# NOTE: data will be stored inside an auto-generated subdir -destination_chroot: /sabayon - -# Merge directory with destination chroot -# merge_destination_chroot: - -# Extra mirror (r)sync parameters -# extra_rsync_parameters: - -# Error script command, executed when something went wrong and molecule has to terminate the execution -# environment variables exported: -# - CHROOT_DIR: path to chroot directory, if any -# - CDROOT_DIR: path to livecd root directory, if any -# - SOURCE_CHROOT_DIR: path from where chroot is copied for final handling -# error_script: /path/to/script/to/be/executed/outside/after - -# Outer chroot script command, to be executed outside destination chroot before packing it -# - amd64-archscript.sh - setup kernel bins -# outer_chroot_script: /path/to/script/to/be/executed/outside - -# Inner chroot script command, to be executed inside destination chroot before packing it -# - kmerge.sh - setup kernel bins -inner_chroot_script: /sabayon/scripts/inner_chroot_script.sh - -# Destination LiveCD root directory, where files are placed before getting mkisofs'ed -# NOTE: data will be stored inside an auto-generated subdir -destination_livecd_root: /sabayon - -# Merge directory with destination LiveCD root -merge_livecd_root: /sabayon/boot/standard - -# Extra mksquashfs parameters -# extra_mksquashfs_parameters: - -# Extra mkisofs parameters, perhaps something to include/use your bootloader -extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat - -# Pre-ISO building script. Hook to be able to copy kernel images in place, for example -pre_iso_script: /sabayon/scripts/cdroot.py - -# Destination directory for the ISO image path -destination_iso_directory: /home/fabio - -# Destination ISO image name, call whatever you want.iso, not mandatory -# destination_iso_image_name: - -# Directories to remove completely (comma separated) -paths_to_remove: - /var/lib/entropy/client/database/amd64/sabayonlinux.org, - /boot/grub/grub.conf, - /root/.subversion, - /lib/udev-state/devices.tar.bz2, - /var/log/scrollkeeper.log, /var/log/genkernel.log, - /var/log/emerge.log, /usr/tmp/portage/*, - /root/.bash_history, /home/sabayonuser/.bash_history, - /Installation, - /finalize_livecd, - /home/sabayonuser/.kde3.5/share/config/konq_history, - /home/sabayonuser/.kde3.5/share/apps/kcookiejar/cookies, - /usr/share/slocate/slocate.db, - /lib/modules/*/video/nvidia.ko, - /lib/modules/*/video/fglrx.ko, - /lib/nvidia/legacy/lib/modules/*/video/nvidia.ko, - /root/test-results.txt, - /root/test.sh, - /usr/portage/distfiles/*, - /usr/portage/packages/*, - /root/.revdep*, - /install-data/games/*, - /var/lib/entropy/store/*, - /var/log/entropy/*, - /var/lib/entropy/caches/*, - /var/lib/entropy/smartapps/amd64/*, - /var/lib/entropy/smartapps/amd64/*, - /var/lib/entropy/tmp/*, - /*.txt, - /usr/portage/a*, - /usr/portage/b*, - /usr/portage/c*, - /usr/portage/d*, - /usr/portage/e*, - /usr/portage/f*, - /usr/portage/g*, - /usr/portage/h*, - /usr/portage/i*, - /usr/portage/j*, - /usr/portage/k*, - /usr/portage/licenses, - /usr/portage/lxde*, - /usr/portage/m*, - /usr/portage/n*, - /usr/portage/o*, - /usr/portage/packages, - /usr/portage/pe*, - /usr/portage/q*, - /usr/portage/r*, - /usr/portage/s*, - /usr/portage/t*, - /usr/portage/u*, - /usr/portage/v*, - /usr/portage/w*, - /usr/portage/x*, - /usr/portage/y*, - /usr/portage/z*, - /etc/ssh/ssh_host_*, - /entropy, - /tmp/equoerror.txt, - /var/cache/man, - /usr/src/* - -# Directories to empty (comma separated) -paths_to_empty: - /home/sabayonuser/.thumbnails/, - /var/tmp, - /root/.ccache, - /var/tmp/portage, - /var/tmp/ccache, - /var/tmp/portage-pkg, - /var/tmp/binpkgs, - /var/lib/entropy/portage, - /var/lib/entropy/logs, - /var/lib/entropy/packages/amd64/4 - diff --git a/examples/specs/4-amd64-k.spec b/examples/specs/4-amd64-k.spec deleted file mode 100755 index 124ba61..0000000 --- a/examples/specs/4-amd64-k.spec +++ /dev/null @@ -1,150 +0,0 @@ -# Sabayon Linux 4 amd64 Molecule spec file -# squashfs, mkisofs needed - -# Define an alternative execution strategy, in this case, the value must be -# "livecd" -# execution_strategy: livecd - -# pre chroot command, example, for 32bit chroots on 64bit system, you always have to append "linux32" -# this is useful for inner_chroot_script -# prechroot: - -# Release string -release_string: Sabayon Linux - -# Release Version -release_version: 4.1RC1 - -# Release Version string description -release_desc: amd64 K - -# Release file (inside chroot) -release_file: /etc/sabayon-edition - -# Source chroot directory, where files are pulled from -source_chroot: /sabayon/sources/amd64_kde-2009 - -# Destination chroot directory, where files are pushed to before creating the squashfs image -# NOTE: data will be stored inside an auto-generated subdir -destination_chroot: /sabayon - -# Merge directory with destination chroot -# merge_destination_chroot: - -# Extra mirror (r)sync parameters -# extra_rsync_parameters: - -# Error script command, executed when something went wrong and molecule has to terminate the execution -# environment variables exported: -# - CHROOT_DIR: path to chroot directory, if any -# - CDROOT_DIR: path to livecd root directory, if any -# - SOURCE_CHROOT_DIR: path from where chroot is copied for final handling -# error_script: /path/to/script/to/be/executed/outside/after - -# Outer chroot script command, to be executed outside destination chroot before packing it -# - amd64-archscript.sh - setup kernel bins -# outer_chroot_script: /path/to/script/to/be/executed/outside - -# Inner chroot script command, to be executed inside destination chroot before packing it -# - kmerge.sh - setup kernel bins -inner_chroot_script: /sabayon/scripts/inner_chroot_script.sh - -# Destination LiveCD root directory, where files are placed before getting mkisofs'ed -# NOTE: data will be stored inside an auto-generated subdir -destination_livecd_root: /sabayon - -# Merge directory with destination LiveCD root -merge_livecd_root: /sabayon/boot/standard - -# Extra mksquashfs parameters -# extra_mksquashfs_parameters: - -# Extra mkisofs parameters, perhaps something to include/use your bootloader -extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat - -# Pre-ISO building script. Hook to be able to copy kernel images in place, for example -pre_iso_script: /sabayon/scripts/cdroot.py - -# Destination directory for the ISO image path -destination_iso_directory: /home/fabio - -# Destination ISO image name, call whatever you want.iso, not mandatory -# destination_iso_image_name: - -# Directories to remove completely (comma separated) -paths_to_remove: - /var/lib/entropy/client/database/amd64/sabayonlinux.org, - /boot/grub/grub.conf, - /root/.subversion, - /lib/udev-state/devices.tar.bz2, - /var/log/scrollkeeper.log, /var/log/genkernel.log, - /var/log/emerge.log, /usr/tmp/portage/*, - /root/.bash_history, /home/sabayonuser/.bash_history, - /Installation, - /finalize_livecd, - /home/sabayonuser/.kde3.5/share/config/konq_history, - /home/sabayonuser/.kde3.5/share/apps/kcookiejar/cookies, - /usr/share/slocate/slocate.db, - /lib/modules/*/video/nvidia.ko, - /lib/modules/*/video/fglrx.ko, - /lib/nvidia/legacy/lib/modules/*/video/nvidia.ko, - /root/test-results.txt, - /root/test.sh, - /usr/portage/distfiles/*, - /usr/portage/packages/*, - /root/.revdep*, - /install-data/games/*, - /var/lib/entropy/store/*, - /var/log/entropy/*, - /var/lib/entropy/caches/*, - /var/lib/entropy/smartapps/amd64/*, - /var/lib/entropy/smartapps/amd64/*, - /var/lib/entropy/tmp/*, - /*.txt, - /usr/portage/a*, - /usr/portage/b*, - /usr/portage/c*, - /usr/portage/d*, - /usr/portage/e*, - /usr/portage/f*, - /usr/portage/g*, - /usr/portage/h*, - /usr/portage/i*, - /usr/portage/j*, - /usr/portage/k*, - /usr/portage/licenses, - /usr/portage/lxde*, - /usr/portage/m*, - /usr/portage/n*, - /usr/portage/o*, - /usr/portage/packages, - /usr/portage/pe*, - /usr/portage/q*, - /usr/portage/r*, - /usr/portage/s*, - /usr/portage/t*, - /usr/portage/u*, - /usr/portage/v*, - /usr/portage/w*, - /usr/portage/x*, - /usr/portage/y*, - /usr/portage/z*, - /etc/ssh/ssh_host_*, - /entropy, - /tmp/equoerror.txt, - /var/cache/man, - /usr/src/* - -# Directories to empty (comma separated) -paths_to_empty: - /home/sabayonuser/.thumbnails/, - /var/tmp, - /root/.ccache, - /var/tmp/portage, - /var/tmp/ccache, - /var/tmp/portage-pkg, - /var/tmp/binpkgs, - /var/lib/entropy/portage, - /var/lib/entropy/logs, - /var/lib/entropy/packages/amd64/4 - diff --git a/examples/specs/4-x86-g.spec b/examples/specs/4-x86-g.spec deleted file mode 100755 index c29d4b7..0000000 --- a/examples/specs/4-x86-g.spec +++ /dev/null @@ -1,153 +0,0 @@ -# Sabayon Linux 4 x86 Molecule spec file -# squashfs, mkisofs needed - -# Define an alternative execution strategy, in this case, the value must be -# "livecd" -# execution_strategy: livecd - -# pre chroot command, example, for 32bit chroots on 64bit system, you always have to append "linux32" -# this is useful for inner_chroot_script -prechroot: linux32 - -# Release string -release_string: Sabayon Linux - -# Release Version -release_version: 4.1RC1 - -# Release Version string description -release_desc: x86 G - -# Release file (inside chroot) -release_file: /etc/sabayon-edition - -# Source chroot directory, where files are pulled from -source_chroot: /sabayon/sources/x86_gnome-2009 - -# Destination chroot directory, where files are pushed to before creating the squashfs image -# NOTE: data will be stored inside an auto-generated subdir -destination_chroot: /sabayon - -# Merge directory with destination chroot -# merge_destination_chroot: - -# Extra mirror (r)sync parameters -# extra_rsync_parameters: - -# Error script command, executed when something went wrong and molecule has to terminate the execution -# environment variables exported: -# - CHROOT_DIR: path to chroot directory, if any -# - CDROOT_DIR: path to livecd root directory, if any -# - SOURCE_CHROOT_DIR: path from where chroot is copied for final handling -# error_script: /path/to/script/to/be/executed/outside/after - -# Outer chroot script command, to be executed outside destination chroot before packing it -# - x86-archscript.sh - setup kernel bins -# outer_chroot_script: /path/to/script/to/be/executed/outside - -# Inner chroot script command, to be executed inside destination chroot before packing it -# - kmerge.sh - setup kernel bins -inner_chroot_script: /sabayon/scripts/inner_chroot_script.sh - -# Destination LiveCD root directory, where files are placed before getting mkisofs'ed -# NOTE: data will be stored inside an auto-generated subdir -destination_livecd_root: /sabayon - -# Merge directory with destination LiveCD root -merge_livecd_root: /sabayon/boot/standard - -# Extra mksquashfs parameters -# extra_mksquashfs_parameters: - -# Extra mkisofs parameters, perhaps something to include/use your bootloader -extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat - -# Pre-ISO building script. Hook to be able to copy kernel images in place, for example -pre_iso_script: /sabayon/scripts/cdroot.py - -# Destination directory for the ISO image path -destination_iso_directory: /home/fabio - -# Destination ISO image name, call whatever you want.iso, not mandatory -# destination_iso_image_name: - -# Directories to remove completely (comma separated) -paths_to_remove: - /var/lib/entropy/client/database/x86/sabayonlinux.org, - /boot/grub/grub.conf, - /root/.subversion, - /lib/udev-state/devices.tar.bz2, - /var/log/scrollkeeper.log, - /var/log/genkernel.log, - /var/log/emerge.log, - /usr/tmp/portage/*, - /root/.bash_history, - /home/sabayonuser/.bash_history, - /Installation, - /finalize_livecd, - /home/sabayonuser/.kde3.5/share/config/konq_history, - /home/sabayonuser/.kde3.5/share/apps/kcookiejar/cookies, - /usr/share/slocate/slocate.db, - /lib/modules/*/video/nvidia.ko, - /lib/modules/*/video/fglrx.ko, - /lib/nvidia/legacy/lib/modules/*/video/nvidia.ko, - /root/test-results.txt, - /root/test.sh, - /usr/portage/distfiles/*, - /usr/portage/packages/*, - /root/.revdep*, - /install-data/games/*, - /var/lib/entropy/store/*, - /var/log/entropy/*, - /var/lib/entropy/caches/*, - /var/lib/entropy/smartapps/amd64/*, - /var/lib/entropy/smartapps/x86/*, - /var/lib/entropy/tmp/*, - /*.txt, - /usr/portage/a*, - /usr/portage/b*, - /usr/portage/c*, - /usr/portage/d*, - /usr/portage/e*, - /usr/portage/f*, - /usr/portage/g*, - /usr/portage/h*, - /usr/portage/i*, - /usr/portage/j*, - /usr/portage/k*, - /usr/portage/licenses, - /usr/portage/lxde*, - /usr/portage/m*, - /usr/portage/n*, - /usr/portage/o*, - /usr/portage/packages, - /usr/portage/pe*, - /usr/portage/q*, - /usr/portage/r*, - /usr/portage/s*, - /usr/portage/t*, - /usr/portage/u*, - /usr/portage/v*, - /usr/portage/w*, - /usr/portage/x*, - /usr/portage/y*, - /usr/portage/z*, - /etc/ssh/ssh_host_*, - /entropy, - /tmp/equoerror.txt, - /var/cache/man, - /usr/src/* - -# Directories to empty (comma separated) -paths_to_empty: - /home/sabayonuser/.thumbnails/, - /var/tmp, - /root/.ccache, - /var/tmp/portage, - /var/tmp/ccache, - /var/tmp/portage-pkg, - /var/tmp/binpkgs, - /var/lib/entropy/portage, - /var/lib/entropy/logs, - /var/lib/entropy/packages/x86/4 - diff --git a/examples/specs/4-x86-k.spec b/examples/specs/4-x86-k.spec deleted file mode 100755 index 57a9bff..0000000 --- a/examples/specs/4-x86-k.spec +++ /dev/null @@ -1,153 +0,0 @@ -# Sabayon Linux 4 x86 Molecule spec file -# squashfs, mkisofs needed - -# Define an alternative execution strategy, in this case, the value must be -# "livecd" -# execution_strategy: livecd - -# pre chroot command, example, for 32bit chroots on 64bit system, you always have to append "linux32" -# this is useful for inner_chroot_script -prechroot: linux32 - -# Release string -release_string: Sabayon Linux - -# Release Version -release_version: 4.1RC1 - -# Release Version string description -release_desc: x86 K - -# Release file (inside chroot) -release_file: /etc/sabayon-edition - -# Source chroot directory, where files are pulled from -source_chroot: /sabayon/sources/x86_kde-2009 - -# Destination chroot directory, where files are pushed to before creating the squashfs image -# NOTE: data will be stored inside an auto-generated subdir -destination_chroot: /sabayon - -# Merge directory with destination chroot -# merge_destination_chroot: - -# Extra mirror (r)sync parameters -# extra_rsync_parameters: - -# Error script command, executed when something went wrong and molecule has to terminate the execution -# environment variables exported: -# - CHROOT_DIR: path to chroot directory, if any -# - CDROOT_DIR: path to livecd root directory, if any -# - SOURCE_CHROOT_DIR: path from where chroot is copied for final handling -# error_script: /path/to/script/to/be/executed/outside/after - -# Outer chroot script command, to be executed outside destination chroot before packing it -# - x86-archscript.sh - setup kernel bins -# outer_chroot_script: /path/to/script/to/be/executed/outside - -# Inner chroot script command, to be executed inside destination chroot before packing it -# - kmerge.sh - setup kernel bins -inner_chroot_script: /sabayon/scripts/inner_chroot_script.sh - -# Destination LiveCD root directory, where files are placed before getting mkisofs'ed -# NOTE: data will be stored inside an auto-generated subdir -destination_livecd_root: /sabayon - -# Merge directory with destination LiveCD root -merge_livecd_root: /sabayon/boot/standard - -# Extra mksquashfs parameters -# extra_mksquashfs_parameters: - -# Extra mkisofs parameters, perhaps something to include/use your bootloader -extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat - -# Pre-ISO building script. Hook to be able to copy kernel images in place, for example -pre_iso_script: /sabayon/scripts/cdroot.py - -# Destination directory for the ISO image path -destination_iso_directory: /home/fabio - -# Destination ISO image name, call whatever you want.iso, not mandatory -# destination_iso_image_name: - -# Directories to remove completely (comma separated) -paths_to_remove: - /var/lib/entropy/client/database/x86/sabayonlinux.org, - /boot/grub/grub.conf, - /root/.subversion, - /lib/udev-state/devices.tar.bz2, - /var/log/scrollkeeper.log, - /var/log/genkernel.log, - /var/log/emerge.log, - /usr/tmp/portage/*, - /root/.bash_history, - /home/sabayonuser/.bash_history, - /Installation, - /finalize_livecd, - /home/sabayonuser/.kde3.5/share/config/konq_history, - /home/sabayonuser/.kde3.5/share/apps/kcookiejar/cookies, - /usr/share/slocate/slocate.db, - /lib/modules/*/video/nvidia.ko, - /lib/modules/*/video/fglrx.ko, - /lib/nvidia/legacy/lib/modules/*/video/nvidia.ko, - /root/test-results.txt, - /root/test.sh, - /usr/portage/distfiles/*, - /usr/portage/packages/*, - /root/.revdep*, - /install-data/games/*, - /var/lib/entropy/store/*, - /var/log/entropy/*, - /var/lib/entropy/caches/*, - /var/lib/entropy/smartapps/amd64/*, - /var/lib/entropy/smartapps/x86/*, - /var/lib/entropy/tmp/*, - /*.txt, - /usr/portage/a*, - /usr/portage/b*, - /usr/portage/c*, - /usr/portage/d*, - /usr/portage/e*, - /usr/portage/f*, - /usr/portage/g*, - /usr/portage/h*, - /usr/portage/i*, - /usr/portage/j*, - /usr/portage/k*, - /usr/portage/licenses, - /usr/portage/lxde*, - /usr/portage/m*, - /usr/portage/n*, - /usr/portage/o*, - /usr/portage/packages, - /usr/portage/pe*, - /usr/portage/q*, - /usr/portage/r*, - /usr/portage/s*, - /usr/portage/t*, - /usr/portage/u*, - /usr/portage/v*, - /usr/portage/w*, - /usr/portage/x*, - /usr/portage/y*, - /usr/portage/z*, - /etc/ssh/ssh_host_*, - /entropy, - /tmp/equoerror.txt, - /var/cache/man, - /usr/src/* - -# Directories to empty (comma separated) -paths_to_empty: - /home/sabayonuser/.thumbnails/, - /var/tmp, - /root/.ccache, - /var/tmp/portage, - /var/tmp/ccache, - /var/tmp/portage-pkg, - /var/tmp/binpkgs, - /var/lib/entropy/portage, - /var/lib/entropy/logs, - /var/lib/entropy/packages/x86/4 - diff --git a/examples/specs/5-amd64-g.spec b/examples/specs/5-amd64-g.spec old mode 100755 new mode 100644 index 499a2b6..dbfa883 --- a/examples/specs/5-amd64-g.spec +++ b/examples/specs/5-amd64-g.spec @@ -1,10 +1,6 @@ # Sabayon Linux 4 amd64 Molecule spec file # squashfs, mkisofs needed -# Define an alternative execution strategy, in this case, the value must be -# "livecd" -# execution_strategy: livecd - # pre chroot command, example, for 32bit chroots on 64bit system, you always have to append "linux32" # this is useful for inner_chroot_script # prechroot: @@ -13,7 +9,7 @@ release_string: Sabayon Linux # Release Version -release_version: 5.0 +release_version: 5.3 # Release Version string description release_desc: amd64 G @@ -32,27 +28,20 @@ destination_chroot: /sabayon # merge_destination_chroot: # Extra mirror (r)sync parameters -# extra_rsync_parameters: - -# Error script command, executed when something went wrong and molecule has to terminate the execution -# environment variables exported: -# - CHROOT_DIR: path to chroot directory, if any -# - CDROOT_DIR: path to livecd root directory, if any -# - SOURCE_CHROOT_DIR: path from where chroot is copied for final handling -# error_script: /path/to/script/to/be/executed/outside/after +extra_rsync_parameters: --one-file-system --exclude proc/* # Outer chroot script command, to be executed outside destination chroot before packing it # - amd64-archscript.sh - setup kernel bins -# outer_chroot_script: /path/to/script/to/be/executed/outside +outer_chroot_script: /sabayon/scripts/remaster_pre.sh + +# Outer chroot script command, to be executed outside destination chroot before +# before entering it (and AFTER inner_chroot_script) +outer_chroot_script_after: /sabayon/scripts/remaster_post.sh # Inner chroot script command, to be executed inside destination chroot before packing it # - kmerge.sh - setup kernel bins inner_chroot_script: /sabayon/scripts/inner_chroot_script.sh -# Outer chroot script command, to be executed outside destination chroot before -# before entering it (and AFTER inner_chroot_script) -# outer_chroot_script_after: /path/to/script/to/be/executed/outside/after - # Destination LiveCD root directory, where files are placed before getting mkisofs'ed # NOTE: data will be stored inside an auto-generated subdir destination_livecd_root: /sabayon @@ -70,10 +59,10 @@ extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat pre_iso_script: /sabayon/scripts/cdroot.py # Destination directory for the ISO image path -destination_iso_directory: /home/fabio +destination_iso_directory: /sabayon/iso # Destination ISO image name, call whatever you want.iso, not mandatory -# destination_iso_image_name: +destination_iso_image_name: Sabayon_Linux_5.3_amd64_G.iso # Directories to remove completely (comma separated) paths_to_remove: @@ -97,7 +86,7 @@ paths_to_remove: /var/lib/entropy/smartapps/amd64/*, /var/lib/entropy/smartapps/amd64/*, /var/lib/entropy/tmp/*, - /var/lib/entropy/packages/*, + /var/lib/entropy/packages*/*, /var/tmp/entropy/*, /*.txt, /usr/portage/a*, @@ -129,10 +118,20 @@ paths_to_remove: /usr/portage/y*, /usr/portage/z*, /etc/ssh/ssh_host_*, + /var/run/screen*, /entropy, /tmp/equoerror.txt, /var/cache/man, - /var/lib/entropy/glsa/* + /var/lib/entropy/glsa/*, + /opt/anaconda/usr/lib32, + /opt/anaconda/usr/share/anaconda/po, + /var/log/entropy/*.log, + /etc/mtab, + /boot/grub/grub.c*, + /tmp/.ICE-unix*, + /tmp/*.txt, + /tmp/.X*, + /boot/grub/device.map # Directories to empty (comma separated) paths_to_empty: diff --git a/examples/specs/5-amd64-k.spec b/examples/specs/5-amd64-k.spec old mode 100755 new mode 100644 index d35ac38..0783a77 --- a/examples/specs/5-amd64-k.spec +++ b/examples/specs/5-amd64-k.spec @@ -1,10 +1,6 @@ # Sabayon Linux 4 amd64 Molecule spec file # squashfs, mkisofs needed -# Define an alternative execution strategy, in this case, the value must be -# "livecd" -# execution_strategy: livecd - # pre chroot command, example, for 32bit chroots on 64bit system, you always have to append "linux32" # this is useful for inner_chroot_script # prechroot: @@ -13,7 +9,7 @@ release_string: Sabayon Linux # Release Version -release_version: 5.0 +release_version: 5.3 # Release Version string description release_desc: amd64 K @@ -32,27 +28,20 @@ destination_chroot: /sabayon # merge_destination_chroot: # Extra mirror (r)sync parameters -# extra_rsync_parameters: - -# Error script command, executed when something went wrong and molecule has to terminate the execution -# environment variables exported: -# - CHROOT_DIR: path to chroot directory, if any -# - CDROOT_DIR: path to livecd root directory, if any -# - SOURCE_CHROOT_DIR: path from where chroot is copied for final handling -# error_script: /path/to/script/to/be/executed/outside/after +extra_rsync_parameters: --one-file-system --exclude proc/* # Outer chroot script command, to be executed outside destination chroot before packing it # - amd64-archscript.sh - setup kernel bins -# outer_chroot_script: /path/to/script/to/be/executed/outside +outer_chroot_script: /sabayon/scripts/remaster_pre.sh + +# Outer chroot script command, to be executed outside destination chroot before +# before entering it (and AFTER inner_chroot_script) +outer_chroot_script_after: /sabayon/scripts/remaster_post.sh # Inner chroot script command, to be executed inside destination chroot before packing it # - kmerge.sh - setup kernel bins inner_chroot_script: /sabayon/scripts/inner_chroot_script.sh -# Outer chroot script command, to be executed outside destination chroot before -# before entering it (and AFTER inner_chroot_script) -# outer_chroot_script_after: /path/to/script/to/be/executed/outside/after - # Destination LiveCD root directory, where files are placed before getting mkisofs'ed # NOTE: data will be stored inside an auto-generated subdir destination_livecd_root: /sabayon @@ -70,10 +59,10 @@ extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat pre_iso_script: /sabayon/scripts/cdroot.py # Destination directory for the ISO image path -destination_iso_directory: /home/fabio +destination_iso_directory: /sabayon/iso # Destination ISO image name, call whatever you want.iso, not mandatory -# destination_iso_image_name: +destination_iso_image_name: Sabayon_Linux_5.3_amd64_K.iso # Directories to remove completely (comma separated) paths_to_remove: @@ -97,7 +86,7 @@ paths_to_remove: /var/lib/entropy/smartapps/amd64/*, /var/lib/entropy/smartapps/amd64/*, /var/lib/entropy/tmp/*, - /var/lib/entropy/packages/*, + /var/lib/entropy/packages*/*, /var/tmp/entropy/*, /*.txt, /usr/portage/a*, @@ -129,10 +118,20 @@ paths_to_remove: /usr/portage/y*, /usr/portage/z*, /etc/ssh/ssh_host_*, + /var/run/screen*, /entropy, /tmp/equoerror.txt, /var/cache/man, - /var/lib/entropy/glsa/* + /var/lib/entropy/glsa/*, + /opt/anaconda/usr/lib32, + /opt/anaconda/usr/share/anaconda/po, + /var/log/entropy/*.log, + /etc/mtab, + /boot/grub/grub.c*, + /tmp/.ICE-unix*, + /tmp/*.txt, + /tmp/.X*, + /boot/grub/device.map # Directories to empty (comma separated) paths_to_empty: diff --git a/examples/specs/5-x86-g.spec b/examples/specs/5-x86-g.spec old mode 100755 new mode 100644 index 43e7229..b95831e --- a/examples/specs/5-x86-g.spec +++ b/examples/specs/5-x86-g.spec @@ -1,10 +1,6 @@ # Sabayon Linux 4 x86 Molecule spec file # squashfs, mkisofs needed -# Define an alternative execution strategy, in this case, the value must be -# "livecd" -# execution_strategy: livecd - # pre chroot command, example, for 32bit chroots on 64bit system, you always have to append "linux32" # this is useful for inner_chroot_script prechroot: linux32 @@ -13,7 +9,7 @@ prechroot: linux32 release_string: Sabayon Linux # Release Version -release_version: 5.0 +release_version: 5.3 # Release Version string description release_desc: x86 G @@ -32,27 +28,20 @@ destination_chroot: /sabayon # merge_destination_chroot: # Extra mirror (r)sync parameters -# extra_rsync_parameters: - -# Error script command, executed when something went wrong and molecule has to terminate the execution -# environment variables exported: -# - CHROOT_DIR: path to chroot directory, if any -# - CDROOT_DIR: path to livecd root directory, if any -# - SOURCE_CHROOT_DIR: path from where chroot is copied for final handling -# error_script: /path/to/script/to/be/executed/outside/after +extra_rsync_parameters: --one-file-system --exclude proc/* # Outer chroot script command, to be executed outside destination chroot before packing it # - x86-archscript.sh - setup kernel bins -# outer_chroot_script: /path/to/script/to/be/executed/outside +outer_chroot_script: /sabayon/scripts/remaster_pre.sh + +# Outer chroot script command, to be executed outside destination chroot before +# before entering it (and AFTER inner_chroot_script) +outer_chroot_script_after: /sabayon/scripts/remaster_post.sh # Inner chroot script command, to be executed inside destination chroot before packing it # - kmerge.sh - setup kernel bins inner_chroot_script: /sabayon/scripts/inner_chroot_script.sh -# Outer chroot script command, to be executed outside destination chroot before -# before entering it (and AFTER inner_chroot_script) -# outer_chroot_script_after: /path/to/script/to/be/executed/outside/after - # Destination LiveCD root directory, where files are placed before getting mkisofs'ed # NOTE: data will be stored inside an auto-generated subdir destination_livecd_root: /sabayon @@ -70,10 +59,10 @@ extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat pre_iso_script: /sabayon/scripts/cdroot.py # Destination directory for the ISO image path -destination_iso_directory: /home/fabio +destination_iso_directory: /sabayon/iso # Destination ISO image name, call whatever you want.iso, not mandatory -# destination_iso_image_name: +destination_iso_image_name: Sabayon_Linux_5.3_x86_G.iso # Directories to remove completely (comma separated) paths_to_remove: @@ -99,7 +88,7 @@ paths_to_remove: /var/lib/entropy/smartapps/amd64/*, /var/lib/entropy/smartapps/x86/*, /var/lib/entropy/tmp/*, - /var/lib/entropy/packages/*, + /var/lib/entropy/packages*/*, /var/tmp/entropy/*, /*.txt, /usr/portage/a*, @@ -131,10 +120,20 @@ paths_to_remove: /usr/portage/y*, /usr/portage/z*, /etc/ssh/ssh_host_*, + /var/run/screen*, /entropy, /tmp/equoerror.txt, /var/cache/man, - /var/lib/entropy/glsa/* + /var/lib/entropy/glsa/*, + /opt/anaconda/usr/lib64, + /opt/anaconda/usr/share/anaconda/po, + /var/log/entropy/*.log, + /etc/mtab, + /boot/grub/grub.c*, + /tmp/.ICE-unix*, + /tmp/*.txt, + /tmp/.X*, + /boot/grub/device.map # Directories to empty (comma separated) paths_to_empty: diff --git a/examples/specs/5-x86-k.spec b/examples/specs/5-x86-k.spec old mode 100755 new mode 100644 index aeebcaf..91147d8 --- a/examples/specs/5-x86-k.spec +++ b/examples/specs/5-x86-k.spec @@ -1,10 +1,6 @@ # Sabayon Linux 4 x86 Molecule spec file # squashfs, mkisofs needed -# Define an alternative execution strategy, in this case, the value must be -# "livecd" -# execution_strategy: livecd - # pre chroot command, example, for 32bit chroots on 64bit system, you always have to append "linux32" # this is useful for inner_chroot_script prechroot: linux32 @@ -13,7 +9,7 @@ prechroot: linux32 release_string: Sabayon Linux # Release Version -release_version: 5.0 +release_version: 5.3 # Release Version string description release_desc: x86 K @@ -32,27 +28,20 @@ destination_chroot: /sabayon # merge_destination_chroot: # Extra mirror (r)sync parameters -# extra_rsync_parameters: - -# Error script command, executed when something went wrong and molecule has to terminate the execution -# environment variables exported: -# - CHROOT_DIR: path to chroot directory, if any -# - CDROOT_DIR: path to livecd root directory, if any -# - SOURCE_CHROOT_DIR: path from where chroot is copied for final handling -# error_script: /path/to/script/to/be/executed/outside/after +extra_rsync_parameters: --one-file-system --exclude proc/* # Outer chroot script command, to be executed outside destination chroot before packing it # - x86-archscript.sh - setup kernel bins -# outer_chroot_script: /path/to/script/to/be/executed/outside +outer_chroot_script: /sabayon/scripts/remaster_pre.sh + +# Outer chroot script command, to be executed outside destination chroot before +# before entering it (and AFTER inner_chroot_script) +outer_chroot_script_after: /sabayon/scripts/remaster_post.sh # Inner chroot script command, to be executed inside destination chroot before packing it # - kmerge.sh - setup kernel bins inner_chroot_script: /sabayon/scripts/inner_chroot_script.sh -# Outer chroot script command, to be executed outside destination chroot before -# before entering it (and AFTER inner_chroot_script) -# outer_chroot_script_after: /path/to/script/to/be/executed/outside/after - # Destination LiveCD root directory, where files are placed before getting mkisofs'ed # NOTE: data will be stored inside an auto-generated subdir destination_livecd_root: /sabayon @@ -70,10 +59,10 @@ extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat pre_iso_script: /sabayon/scripts/cdroot.py # Destination directory for the ISO image path -destination_iso_directory: /home/fabio +destination_iso_directory: /sabayon/iso # Destination ISO image name, call whatever you want.iso, not mandatory -# destination_iso_image_name: +destination_iso_image_name: Sabayon_Linux_5.3_x86_K.iso # Directories to remove completely (comma separated) paths_to_remove: @@ -99,7 +88,7 @@ paths_to_remove: /var/lib/entropy/smartapps/amd64/*, /var/lib/entropy/smartapps/x86/*, /var/lib/entropy/tmp/*, - /var/lib/entropy/packages/*, + /var/lib/entropy/packages*/*, /var/tmp/entropy/*, /*.txt, /usr/portage/a*, @@ -131,10 +120,20 @@ paths_to_remove: /usr/portage/y*, /usr/portage/z*, /etc/ssh/ssh_host_*, + /var/run/screen*, /entropy, /tmp/equoerror.txt, /var/cache/man, - /var/lib/entropy/glsa/* + /var/lib/entropy/glsa/*, + /opt/anaconda/usr/lib64, + /opt/anaconda/usr/share/anaconda/po, + /var/log/entropy/*.log, + /etc/mtab, + /boot/grub/grub.c*, + /tmp/.ICE-unix*, + /tmp/*.txt, + /tmp/.X*, + /boot/grub/device.map # Directories to empty (comma separated) paths_to_empty: