From cd57408068cc9d4724ac18e42ab4302b46dc7931 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sun, 4 Oct 2009 21:48:55 +0200 Subject: [PATCH] [examples] update examples dir --- ...iso_script.py => cdroot_pre_iso_script.py} | 2 +- examples/inner_chroot_script.sh | 23 ++- examples/{ => specs}/4-amd64-g.spec | 0 examples/{ => specs}/4-amd64-k.spec | 0 examples/{ => specs}/4-x86-g.spec | 0 examples/{ => specs}/4-x86-k.spec | 0 examples/specs/5-amd64-g.spec | 135 +++++++++++++++++ examples/specs/5-amd64-k.spec | 134 +++++++++++++++++ examples/specs/5-x86-g.spec | 137 ++++++++++++++++++ examples/specs/5-x86-k.spec | 137 ++++++++++++++++++ examples/{ => specs}/Sabayon4-x86.spec | 0 11 files changed, 566 insertions(+), 2 deletions(-) rename examples/{pre_iso_script.py => cdroot_pre_iso_script.py} (97%) rename examples/{ => specs}/4-amd64-g.spec (100%) rename examples/{ => specs}/4-amd64-k.spec (100%) rename examples/{ => specs}/4-x86-g.spec (100%) rename examples/{ => specs}/4-x86-k.spec (100%) create mode 100755 examples/specs/5-amd64-g.spec create mode 100755 examples/specs/5-amd64-k.spec create mode 100755 examples/specs/5-x86-g.spec create mode 100755 examples/specs/5-x86-k.spec rename examples/{ => specs}/Sabayon4-x86.spec (100%) diff --git a/examples/pre_iso_script.py b/examples/cdroot_pre_iso_script.py similarity index 97% rename from examples/pre_iso_script.py rename to examples/cdroot_pre_iso_script.py index 484e58c..9c4f24a 100755 --- a/examples/pre_iso_script.py +++ b/examples/cdroot_pre_iso_script.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 import os, shutil source_chroot_dir = os.getenv('SOURCE_CHROOT_DIR') chroot_dir = os.getenv('CHROOT_DIR') diff --git a/examples/inner_chroot_script.sh b/examples/inner_chroot_script.sh index 8b3fbba..bfcc2d5 100755 --- a/examples/inner_chroot_script.sh +++ b/examples/inner_chroot_script.sh @@ -36,7 +36,7 @@ ACCEPT_LICENSE="NVIDIA" equo install --fetch --nodeps =x11-drivers/nvidia-driver ACCEPT_LICENSE="NVIDIA" equo install --fetch --nodeps =x11-drivers/nvidia-drivers-96* # dropped since no X 1.5 support yet # ACCEPT_LICENSE="NVIDIA" equo install --fetch --nodeps ~x11-drivers/nvidia-drivers-71.86.07 -mv /var/lib/entropy/packages/${mydir}/4/x11-drivers\:nvidia-drivers*.tbz2 /install-data/drivers/ +mv /var/lib/entropy/packages/${mydir}/*/x11-drivers\:nvidia-drivers*.tbz2 /install-data/drivers/ # Add fusion icon to desktop if [ -f "/usr/share/applications/fusion-icon.desktop" ]; then @@ -68,9 +68,30 @@ emaint --fix world # remove anaconda .git rm /opt/anaconda/.git -rf +rm /opt/anaconda/usr/share/anaconda/po/*.po -rf + # copy Portage config from sabayonlinux.org entropy repo to system cp /var/lib/entropy/client/database/*/sabayonlinux.org/standard/*/*/package.mask /etc/portage/package.mask cp /var/lib/entropy/client/database/*/sabayonlinux.org/standard/*/*/package.unmask /etc/portage/package.unmask cp /var/lib/entropy/client/database/*/sabayonlinux.org/standard/*/*/package.use /etc/portage/package.use cp /var/lib/entropy/client/database/*/sabayonlinux.org/standard/*/*/make.conf /etc/make.conf + +# Update sabayon overlay +layman -s sabayon + +# Optimize sabayon overlay +cd /usr/local/portage/layman/sabayon && git gc --aggressive \ + && git repack -a -d -f --depth=250 --window=250 \ + && git repack -ad && git prune + +# if Sabayon GNOME, drop qt-gui bins +gnome_panel=$(qlist -ICve gnome-base/gnome-panel) +if [ -n "${gnome_panel}" ]; then + find /usr/share/applications -name "*qt-gui*.desktop" | xargs rm +fi +# we don't want this on our ISO +rm -f /usr/share/applications/sandbox.desktop + +# Remove wicd from autostart +rm -f /usr/share/autostart/wicd-tray.desktop /etc/xdg/autostart/wicd-tray.desktop diff --git a/examples/4-amd64-g.spec b/examples/specs/4-amd64-g.spec similarity index 100% rename from examples/4-amd64-g.spec rename to examples/specs/4-amd64-g.spec diff --git a/examples/4-amd64-k.spec b/examples/specs/4-amd64-k.spec similarity index 100% rename from examples/4-amd64-k.spec rename to examples/specs/4-amd64-k.spec diff --git a/examples/4-x86-g.spec b/examples/specs/4-x86-g.spec similarity index 100% rename from examples/4-x86-g.spec rename to examples/specs/4-x86-g.spec diff --git a/examples/4-x86-k.spec b/examples/specs/4-x86-k.spec similarity index 100% rename from examples/4-x86-k.spec rename to examples/specs/4-x86-k.spec diff --git a/examples/specs/5-amd64-g.spec b/examples/specs/5-amd64-g.spec new file mode 100755 index 0000000..e0b4d52 --- /dev/null +++ b/examples/specs/5-amd64-g.spec @@ -0,0 +1,135 @@ +# Sabayon Linux 4 amd64 Molecule spec file +# squashfs, mkisofs needed + +# 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: 5.0 + +# 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: + +# 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, + /usr/share/slocate/slocate.db, + /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/*, + /var/lib/entropy/packages/*, + /var/tmp/entropy/*, + /*.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, + /var/lib/entropy/glsa/* + +# 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, + /var/cache/genkernel + diff --git a/examples/specs/5-amd64-k.spec b/examples/specs/5-amd64-k.spec new file mode 100755 index 0000000..a80fe3b --- /dev/null +++ b/examples/specs/5-amd64-k.spec @@ -0,0 +1,134 @@ +# Sabayon Linux 4 amd64 Molecule spec file +# squashfs, mkisofs needed + +# 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: 5.0 + +# 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: + +# 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, + /usr/share/slocate/slocate.db, + /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/*, + /var/lib/entropy/packages/*, + /var/tmp/entropy/*, + /*.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, + /var/lib/entropy/glsa/* + +# 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, + /var/cache/genkernel diff --git a/examples/specs/5-x86-g.spec b/examples/specs/5-x86-g.spec new file mode 100755 index 0000000..de09a07 --- /dev/null +++ b/examples/specs/5-x86-g.spec @@ -0,0 +1,137 @@ +# Sabayon Linux 4 x86 Molecule spec file +# squashfs, mkisofs needed + +# 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: 5.0 + +# 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: + +# 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, + /usr/share/slocate/slocate.db, + /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/*, + /var/lib/entropy/packages/*, + /var/tmp/entropy/*, + /*.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, + /var/lib/entropy/glsa/* + +# 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, + /var/cache/genkernel + diff --git a/examples/specs/5-x86-k.spec b/examples/specs/5-x86-k.spec new file mode 100755 index 0000000..b1bcba4 --- /dev/null +++ b/examples/specs/5-x86-k.spec @@ -0,0 +1,137 @@ +# Sabayon Linux 4 x86 Molecule spec file +# squashfs, mkisofs needed + +# 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: 5.0 + +# 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: + +# 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, + /usr/share/slocate/slocate.db, + /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/*, + /var/lib/entropy/packages/*, + /var/tmp/entropy/*, + /*.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, + /var/lib/entropy/glsa/* + +# 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, + /var/cache/genkernel + diff --git a/examples/Sabayon4-x86.spec b/examples/specs/Sabayon4-x86.spec similarity index 100% rename from examples/Sabayon4-x86.spec rename to examples/specs/Sabayon4-x86.spec