sablink/molecules
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[molecules] do not use molecule built-in repository update functionality but rather implement our own (more fault tolerant)

Browse Source
This commit is contained in:
Fabio Erculiani 2010-09-22 12:18:32 +02:00
parent a934c9bec1
commit d91c2c92b1
9 changed files with 35 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
molecules/corecdx.common
View File

@ -15,6 +15,9 @@ release_file: /etc/sabayon-edition
# before entering it (and before inner_chroot_script) # before entering it (and before inner_chroot_script)
outer_chroot_script: /sabayon/scripts/remaster_pre.sh outer_chroot_script: /sabayon/scripts/remaster_pre.sh
# Execute repositories update here, in a more fault-tolerant flavor
inner_chroot_script: /sabayon/scripts/remaster_generic_inner_chroot_script.sh
# Inner chroot script command, to be executed inside destination chroot after # Inner chroot script command, to be executed inside destination chroot after
# packages installation and removal # packages installation and removal
inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script_after.sh fluxbox inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script_after.sh fluxbox
@ -67,4 +70,4 @@ packages_to_add:
# Determine whether repositories update should be run (if packages_to_add is set) # Determine whether repositories update should be run (if packages_to_add is set)
# (default is: no), values are: yes, no. # (default is: no), values are: yes, no.
execute_repositories_update: yes execute_repositories_update: no

6
molecules/e17.common
View File

@ -15,6 +15,9 @@ iso_title: Sabayon E17
# before entering it (and before inner_chroot_script) # before entering it (and before inner_chroot_script)
outer_chroot_script: /sabayon/scripts/remaster_pre.sh outer_chroot_script: /sabayon/scripts/remaster_pre.sh
# Execute repositories update here, in a more fault-tolerant flavor
inner_chroot_script: /sabayon/scripts/remaster_generic_inner_chroot_script.sh
# Inner chroot script command, to be executed inside destination chroot after # Inner chroot script command, to be executed inside destination chroot after
# packages installation and removal # packages installation and removal
inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script_after.sh e17 inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script_after.sh e17
@ -76,4 +79,5 @@ packages_to_add:
# Determine whether repositories update should be run (if packages_to_add is set) # Determine whether repositories update should be run (if packages_to_add is set)
# (default is: no), values are: yes, no. # (default is: no), values are: yes, no.
execute_repositories_update: yes # done in inner_chroot_script
execute_repositories_update: no

5
molecules/gnome.common
View File

@ -15,6 +15,9 @@ iso_title: Sabayon GNOME
# before entering it (and before inner_chroot_script) # before entering it (and before inner_chroot_script)
outer_chroot_script: /sabayon/scripts/remaster_pre.sh outer_chroot_script: /sabayon/scripts/remaster_pre.sh
# Execute repositories update here, in a more fault-tolerant flavor
inner_chroot_script: /sabayon/scripts/remaster_generic_inner_chroot_script.sh
# Inner chroot script command, to be executed inside destination chroot after # Inner chroot script command, to be executed inside destination chroot after
# packages installation and removal # packages installation and removal
inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script_after.sh gnome inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script_after.sh gnome
@ -222,7 +225,7 @@ packages_to_add:
# Determine whether repositories update should be run (if packages_to_add is set) # Determine whether repositories update should be run (if packages_to_add is set)
# (default is: no), values are: yes, no. # (default is: no), values are: yes, no.
execute_repositories_update: yes execute_repositories_update: no
# Directories to remove completely (comma separated) # Directories to remove completely (comma separated)
# paths_to_remove: # paths_to_remove:

5
molecules/kde.common
View File

@ -15,6 +15,9 @@ iso_title: Sabayon KDE
# before entering it (and before inner_chroot_script) # before entering it (and before inner_chroot_script)
outer_chroot_script: /sabayon/scripts/remaster_pre.sh outer_chroot_script: /sabayon/scripts/remaster_pre.sh
# Execute repositories update here, in a more fault-tolerant flavor
inner_chroot_script: /sabayon/scripts/remaster_generic_inner_chroot_script.sh
# Inner chroot script command, to be executed inside destination chroot after # Inner chroot script command, to be executed inside destination chroot after
# packages installation and removal # packages installation and removal
inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script_after.sh kde inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script_after.sh kde
@ -358,7 +361,7 @@ packages_to_add:
# Determine whether repositories update should be run (if packages_to_add is set) # Determine whether repositories update should be run (if packages_to_add is set)
# (default is: no), values are: yes, no. # (default is: no), values are: yes, no.
execute_repositories_update: yes execute_repositories_update: no
# Directories to remove completely (comma separated) # Directories to remove completely (comma separated)
# paths_to_remove: # paths_to_remove:

5
molecules/lxde.common
View File

@ -15,6 +15,9 @@ iso_title: Sabayon LXDE
# before entering it (and before inner_chroot_script) # before entering it (and before inner_chroot_script)
outer_chroot_script: /sabayon/scripts/remaster_pre.sh outer_chroot_script: /sabayon/scripts/remaster_pre.sh
# Execute repositories update here, in a more fault-tolerant flavor
inner_chroot_script: /sabayon/scripts/remaster_generic_inner_chroot_script.sh
# Inner chroot script command, to be executed inside destination chroot after # Inner chroot script command, to be executed inside destination chroot after
# packages installation and removal # packages installation and removal
inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script_after.sh lxde inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script_after.sh lxde
@ -70,7 +73,7 @@ packages_to_add:
# Determine whether repositories update should be run (if packages_to_add is set) # Determine whether repositories update should be run (if packages_to_add is set)
# (default is: no), values are: yes, no. # (default is: no), values are: yes, no.
execute_repositories_update: yes execute_repositories_update: no
# Directories to remove completely (comma separated) # Directories to remove completely (comma separated)
# paths_to_remove: # paths_to_remove:

52
molecules/sabayon-x86-gforensic.spec
View File

@ -1,15 +1,9 @@
# Sabayon Linux 5 x86 GNOME Molecule remaster spec file # Sabayon Linux 5 x86 GNOME Molecule remaster spec file
# The aim of this spec file is to add arbitrary applications & misc stuff # The aim of this spec file is to add arbitrary applications & misc stuff
# to an already built ISO image via scripting (providing hooks that call # to an already built ISO image via scripting (providing hooks that call
# user-defined scripts). # user-defined scripts).
# squashfs, mkisofs needed # squashfs, mkisofs needed
# Define an alternative execution strategy, in this case, the value must be # Define an alternative execution strategy, in this case, the value must be
# "iso_remaster" # "iso_remaster"
execution_strategy: iso_remaster execution_strategy: iso_remaster
@ -30,98 +24,64 @@ release_desc: x86 Gforensic
# have to append "linux32" this is useful for inner_chroot_script # have to append "linux32" this is useful for inner_chroot_script
prechroot: linux32 prechroot: linux32
# Path to source ISO file (MANDATORY) # Path to source ISO file (MANDATORY)
source_iso: /sabayon/iso/Sabayon_Linux_DAILY_x86_G.iso source_iso: /sabayon/iso/Sabayon_Linux_DAILY_x86_G.iso
# Outer chroot script command, to be executed outside destination chroot before # Outer chroot script command, to be executed outside destination chroot before
# before entering it (and before inner_chroot_script) # before entering it (and before inner_chroot_script)
outer_chroot_script: /sabayon/scripts/remaster_pre.sh outer_chroot_script: /sabayon/scripts/remaster_pre.sh
# Inner chroot script command, to be executed inside destination chroot before packing it # Inner chroot script command, to be executed inside destination chroot before packing it
# - kmerge.sh - setup kernel bins # - kmerge.sh - setup kernel bins
# inner_chroot_script: # inner_chroot_script:
# Execute repositories update here, in a more fault-tolerant flavor
inner_chroot_script: /sabayon/scripts/remaster_generic_inner_chroot_script.sh
# Inner chroot script command, to be executed inside destination chroot after # Inner chroot script command, to be executed inside destination chroot after
# packages installation and removal # packages installation and removal
inner_chroot_script_after: /sabayon/scripts/remaster_gforensic_inner_chroot_script_after.sh gnome inner_chroot_script_after: /sabayon/scripts/remaster_gforensic_inner_chroot_script_after.sh gnome
# Outer chroot script command, to be executed outside destination chroot before # Outer chroot script command, to be executed outside destination chroot before
# before entering it (and AFTER inner_chroot_script) # before entering it (and AFTER inner_chroot_script)
outer_chroot_script_after: /sabayon/scripts/gforensic_remaster_post.sh outer_chroot_script_after: /sabayon/scripts/gforensic_remaster_post.sh
# Extra mkisofs parameters, perhaps something to include/use your bootloader # Extra mkisofs parameters, perhaps something to include/use your bootloader
extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat 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 building script. Hook to be able to copy kernel images in place, for example
# pre_iso_script: /sabayon/scripts/cdroot.py # pre_iso_script: /sabayon/scripts/cdroot.py
# Destination directory for the ISO image path (MANDATORY) # Destination directory for the ISO image path (MANDATORY)
destination_iso_directory: /sabayon/iso destination_iso_directory: /sabayon/iso
# Destination ISO image name, call whatever you want.iso, not mandatory # Destination ISO image name, call whatever you want.iso, not mandatory
destination_iso_image_name: Sabayon_Linux_Gforensic_5.4_x86.iso destination_iso_image_name: Sabayon_Linux_Gforensic_5.4_x86.iso
# Output iso image title # Output iso image title
iso_title: Sabayon_Linux_Forensic_x86_G iso_title: Sabayon_Linux_Forensic_x86_G
# Alternative ISO file mount command (default is: mount -o loop -t iso9660) # Alternative ISO file mount command (default is: mount -o loop -t iso9660)
# iso_mounter: # iso_mounter:
# Alternative ISO umounter command (default is: umount) # Alternative ISO umounter command (default is: umount)
# iso_umounter: # iso_umounter:
# Alternative squashfs file mount command (default is: mount -o loop -t squashfs) # Alternative squashfs file mount command (default is: mount -o loop -t squashfs)
# squash_mounter: # squash_mounter:
# Alternative ISO squashfs umount command (default is: umount) # Alternative ISO squashfs umount command (default is: umount)
# squash_umounter: # squash_umounter:
# Merge directory with destination LiveCD root # Merge directory with destination LiveCD root
# merge_livecd_root: /put/more/files/onto/CD/root # merge_livecd_root: /put/more/files/onto/CD/root
# List of packages that would be removed from chrooted system (comma separated) # List of packages that would be removed from chrooted system (comma separated)
packages_to_remove: gnome-base/gnome-mount, net-dialup/pptpclient, net-dialup/gnome-ppp, net-dialup/globespan-adsl, net-dialup/wvdial, app-office/openoffice-l10n-de, app-office/openoffice-l10n-es, app-office/openoffice-l10n-fr, app-office/openoffice-l10n-it, app-office/openoffice-l10n-nl, app-office/openoffice-l10n-pt, games-puzzle/world-of-goo-demo, media-tv/xbmc, net-irc/xchat, www-client/firefox, x11-wm/fluxbox, x11-libs/compiz-bcop, x11-plugins/compiz-plugins-extra, x11-plugins/compiz-plugins-main, x11-wm/compiz, x11-themes/emerald-themes, x11-themes/emerald-themes, app-emulation/virtualbox-guest-additions, x11-drivers/xf86-input-virtualbox, x11-drivers/xf86-video-virtualbox, x11-terms/guake, gnome-extra/gnome-games, media-tv/linuxtv-dvb-headers, media-tv/ivtv-firmware, media-tv/afatech9005-firmware, www-client/lynx, net-p2p/deluge, media-gfx/gimp packages_to_remove: gnome-base/gnome-mount, net-dialup/pptpclient, net-dialup/gnome-ppp, net-dialup/globespan-adsl, net-dialup/wvdial, app-office/openoffice-l10n-de, app-office/openoffice-l10n-es, app-office/openoffice-l10n-fr, app-office/openoffice-l10n-it, app-office/openoffice-l10n-nl, app-office/openoffice-l10n-pt, games-puzzle/world-of-goo-demo, media-tv/xbmc, net-irc/xchat, www-client/firefox, x11-wm/fluxbox, x11-libs/compiz-bcop, x11-plugins/compiz-plugins-extra, x11-plugins/compiz-plugins-main, x11-wm/compiz, x11-themes/emerald-themes, x11-themes/emerald-themes, app-emulation/virtualbox-guest-additions, x11-drivers/xf86-input-virtualbox, x11-drivers/xf86-video-virtualbox, x11-terms/guake, gnome-extra/gnome-games, media-tv/linuxtv-dvb-headers, media-tv/ivtv-firmware, media-tv/afatech9005-firmware, www-client/lynx, net-p2p/deluge, media-gfx/gimp
# Custom shell call to packages removal (default is: equo remove) # Custom shell call to packages removal (default is: equo remove)
# custom_packages_remove_cmd: # custom_packages_remove_cmd:
# List of packages that would be added from chrooted system (comma separated) # List of packages that would be added from chrooted system (comma separated)
packages_to_add: sys-apps/slocate, media-fonts/droid, gnome-base/gvfs, app-misc/sabayon-skel, app-misc/screen, www-client/chromium, app-forensics/cmospwd, packages_to_add: sys-apps/slocate, media-fonts/droid, gnome-base/gvfs, app-misc/sabayon-skel, app-misc/screen, www-client/chromium, app-forensics/cmospwd,
app-forensics/rkhunter, app-forensics/sleuthkit, app-antivirus/clamav, app-antivirus/clamtk, app-forensics/autopsy, app-forensics/mac-robber, app-forensics/rkhunter, app-forensics/sleuthkit, app-antivirus/clamav, app-antivirus/clamtk, app-forensics/autopsy, app-forensics/mac-robber,
@ -129,21 +89,15 @@ app-forensics/aide, app-forensics/rdd, app-crypt/chntpw, media-video/vlc, x11-wm
media-gfx/picasa, app-admin/testdisk, app-crypt/fcrackzip, app-crypt/johntheripper, sys-fs/extundelete, app-forensics/magicrescue, app-crypt/ophcrack, media-gfx/picasa, app-admin/testdisk, app-crypt/fcrackzip, app-crypt/johntheripper, sys-fs/extundelete, app-forensics/magicrescue, app-crypt/ophcrack,
app-crypt/ophcrack-tables, net-analyzer/nmap, net-analyzer/netcat6, net-irc/irssi app-crypt/ophcrack-tables, net-analyzer/nmap, net-analyzer/netcat6, net-irc/irssi
# Custom shell call to packages add (default is: equo install) # Custom shell call to packages add (default is: equo install)
# custom_packages_add_cmd: # custom_packages_add_cmd:
# Custom command for updating repositories (default is: equo update) # Custom command for updating repositories (default is: equo update)
# repositories_update_cmd: # repositories_update_cmd:
# Determine whether repositories update should be run (if packages_to_add is set) # Determine whether repositories update should be run (if packages_to_add is set)
# (default is: no), values are: yes, no. # (default is: no), values are: yes, no.
execute_repositories_update: yes execute_repositories_update: no

5
molecules/serverbase.common
View File

@ -15,6 +15,9 @@ release_file: /etc/sabayon-edition
# before entering it (and before inner_chroot_script) # before entering it (and before inner_chroot_script)
outer_chroot_script: /sabayon/scripts/remaster_pre.sh outer_chroot_script: /sabayon/scripts/remaster_pre.sh
# Execute repositories update here, in a more fault-tolerant flavor
inner_chroot_script: /sabayon/scripts/remaster_generic_inner_chroot_script.sh
# Inner chroot script command, to be executed inside destination chroot after # Inner chroot script command, to be executed inside destination chroot after
# packages installation and removal # packages installation and removal
# inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script_after.sh fluxbox # inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script_after.sh fluxbox
@ -40,4 +43,4 @@ packages_to_remove:
# Determine whether repositories update should be run (if packages_to_add is set) # Determine whether repositories update should be run (if packages_to_add is set)
# (default is: no), values are: yes, no. # (default is: no), values are: yes, no.
execute_repositories_update: yes execute_repositories_update: no

5
molecules/xfce.common
View File

@ -15,6 +15,9 @@ iso_title: Sabayon XFCE
# before entering it (and before inner_chroot_script) # before entering it (and before inner_chroot_script)
outer_chroot_script: /sabayon/scripts/remaster_pre.sh outer_chroot_script: /sabayon/scripts/remaster_pre.sh
# Execute repositories update here, in a more fault-tolerant flavor
inner_chroot_script: /sabayon/scripts/remaster_generic_inner_chroot_script.sh
# Inner chroot script command, to be executed inside destination chroot after # Inner chroot script command, to be executed inside destination chroot after
# packages installation and removal # packages installation and removal
inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script_after.sh xfce inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script_after.sh xfce
@ -76,7 +79,7 @@ packages_to_add:
# Determine whether repositories update should be run (if packages_to_add is set) # Determine whether repositories update should be run (if packages_to_add is set)
# (default is: no), values are: yes, no. # (default is: no), values are: yes, no.
execute_repositories_update: yes execute_repositories_update: no
# Directories to remove completely (comma separated) # Directories to remove completely (comma separated)
# paths_to_remove: # paths_to_remove:

3
scripts/remaster_generic_inner_chroot_script.sh Executable file
View File

@ -0,0 +1,3 @@
#!/bin/sh
export FORCE_EAPI=2
equo update || ( sleep 1200 && equo update ) || exit 1