diff --git a/molecules/sabayon-amd64-corecdx.spec b/molecules/sabayon-amd64-corecdx.spec index aff312e..3cec262 100644 --- a/molecules/sabayon-amd64-corecdx.spec +++ b/molecules/sabayon-amd64-corecdx.spec @@ -1,11 +1,11 @@ # Use abs path, otherwise daily iso build won't work %import /sabayon/molecules/corecdx.common -release_version: 5.5 +release_version: 6 release_desc: amd64 CoreCDX # Path to source ISO file (MANDATORY) source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso # Destination ISO image name, call whatever you want.iso, not mandatory -destination_iso_image_name: Sabayon_Linux_CoreCDX_5.5_amd64.iso +destination_iso_image_name: Sabayon_Linux_CoreCDX_6_amd64.iso diff --git a/molecules/sabayon-amd64-e17.spec b/molecules/sabayon-amd64-e17.spec index 2181843..33f78c2 100644 --- a/molecules/sabayon-amd64-e17.spec +++ b/molecules/sabayon-amd64-e17.spec @@ -2,7 +2,7 @@ %import /sabayon/molecules/e17.common # Release Version -release_version: 5.5 +release_version: 6 # Release Version string description release_desc: amd64 E17 @@ -11,4 +11,4 @@ release_desc: amd64 E17 source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso # Destination ISO image name, call whatever you want.iso, not mandatory -destination_iso_image_name: Sabayon_Linux_5.5_amd64_E17.iso +destination_iso_image_name: Sabayon_Linux_6_amd64_E17.iso diff --git a/molecules/sabayon-amd64-gaming.spec b/molecules/sabayon-amd64-gaming.spec index 517033f..49577ac 100644 --- a/molecules/sabayon-amd64-gaming.spec +++ b/molecules/sabayon-amd64-gaming.spec @@ -2,7 +2,7 @@ %import /sabayon/molecules/gaming.common # Release Version -release_version: 5.5 +release_version: 6 # Release Version string description release_desc: amd64 Gaming Edition @@ -11,4 +11,4 @@ release_desc: amd64 Gaming Edition source_iso: /sabayon/iso/Sabayon_Linux_DAILY_amd64_G.iso # Destination ISO image name, call whatever you want.iso, not mandatory -destination_iso_image_name: Sabayon_Linux_5.5_amd64_Gaming.iso +destination_iso_image_name: Sabayon_Linux_6_amd64_Gaming.iso diff --git a/molecules/sabayon-amd64-gnome.spec b/molecules/sabayon-amd64-gnome.spec index d15f625..ef1c56e 100644 --- a/molecules/sabayon-amd64-gnome.spec +++ b/molecules/sabayon-amd64-gnome.spec @@ -2,7 +2,7 @@ %import /sabayon/molecules/gnome.common # Release Version -release_version: 5.5 +release_version: 6 # Release Version string description release_desc: amd64 GNOME @@ -11,4 +11,4 @@ release_desc: amd64 GNOME source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso # Destination ISO image name, call whatever you want.iso, not mandatory -destination_iso_image_name: Sabayon_Linux_5.5_amd64_G.iso +destination_iso_image_name: Sabayon_Linux_6_amd64_G.iso diff --git a/molecules/sabayon-amd64-kde.spec b/molecules/sabayon-amd64-kde.spec index 4bf03e3..a45a009 100644 --- a/molecules/sabayon-amd64-kde.spec +++ b/molecules/sabayon-amd64-kde.spec @@ -2,7 +2,7 @@ %import /sabayon/molecules/kde.common # Release Version -release_version: 5.5 +release_version: 6 # Release Version string description release_desc: amd64 KDE @@ -11,4 +11,4 @@ release_desc: amd64 KDE source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso # Destination ISO image name, call whatever you want.iso, not mandatory -destination_iso_image_name: Sabayon_Linux_5.5_amd64_K.iso +destination_iso_image_name: Sabayon_Linux_6_amd64_K.iso diff --git a/molecules/sabayon-amd64-lxde.spec b/molecules/sabayon-amd64-lxde.spec index 16430d4..c7d0c64 100644 --- a/molecules/sabayon-amd64-lxde.spec +++ b/molecules/sabayon-amd64-lxde.spec @@ -2,7 +2,7 @@ %import /sabayon/molecules/lxde.common # Release Version -release_version: 5.5 +release_version: 6 # Release Version string description release_desc: amd64 LXDE @@ -11,4 +11,4 @@ release_desc: amd64 LXDE source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso # Destination ISO image name, call whatever you want.iso, not mandatory -destination_iso_image_name: Sabayon_Linux_5.5_amd64_LXDE.iso +destination_iso_image_name: Sabayon_Linux_6_amd64_LXDE.iso diff --git a/molecules/sabayon-amd64-serverbase.spec b/molecules/sabayon-amd64-serverbase.spec index 8f30975..63f1138 100644 --- a/molecules/sabayon-amd64-serverbase.spec +++ b/molecules/sabayon-amd64-serverbase.spec @@ -1,11 +1,11 @@ # Use abs path, otherwise daily iso build won't work %import /sabayon/molecules/serverbase.common -release_version: 5.5 +release_version: 6 release_desc: amd64 ServerBase # Path to source ISO file (MANDATORY) source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso # Destination ISO image name, call whatever you want.iso, not mandatory -destination_iso_image_name: Sabayon_Linux_ServerBase_5.5_amd64.iso +destination_iso_image_name: Sabayon_Linux_ServerBase_6_amd64.iso diff --git a/molecules/sabayon-amd64-spinbase-openvz-template.spec b/molecules/sabayon-amd64-spinbase-openvz-template.spec index ba2fb8d..fa5ec44 100644 --- a/molecules/sabayon-amd64-spinbase-openvz-template.spec +++ b/molecules/sabayon-amd64-spinbase-openvz-template.spec @@ -8,5 +8,5 @@ # Path to source ISO file (MANDATORY) source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso -release_version: 5.5 -tar_name: Sabayon_Linux_SpinBase_5.5_amd64_openvz.tar.gz +release_version: 6 +tar_name: Sabayon_Linux_SpinBase_6_amd64_openvz.tar.gz diff --git a/molecules/sabayon-amd64-spinbase.spec b/molecules/sabayon-amd64-spinbase.spec index a877a1a..0d0dcdc 100644 --- a/molecules/sabayon-amd64-spinbase.spec +++ b/molecules/sabayon-amd64-spinbase.spec @@ -3,7 +3,7 @@ # Release Version # Keep this here, otherwise daily builds automagic won't work -release_version: 5.5 +release_version: 6 # Release Version string description release_desc: amd64 SpinBase @@ -13,4 +13,4 @@ source_chroot: /sabayon/sources/amd64_core-2010 # Destination ISO image name, call whatever you want.iso, not mandatory # Keep this here and set, otherwise daily builds automagic won't work -destination_iso_image_name: Sabayon_Linux_SpinBase_5.5_amd64.iso +destination_iso_image_name: Sabayon_Linux_SpinBase_6_amd64.iso diff --git a/molecules/sabayon-amd64-xfce.spec b/molecules/sabayon-amd64-xfce.spec index ad37fa1..f315949 100644 --- a/molecules/sabayon-amd64-xfce.spec +++ b/molecules/sabayon-amd64-xfce.spec @@ -2,7 +2,7 @@ %import /sabayon/molecules/xfce.common # Release Version -release_version: 5.5 +release_version: 6 # Release Version string description release_desc: amd64 XFCE @@ -11,4 +11,4 @@ release_desc: amd64 XFCE source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso # Destination ISO image name, call whatever you want.iso, not mandatory -destination_iso_image_name: Sabayon_Linux_5.5_amd64_XFCE.iso +destination_iso_image_name: Sabayon_Linux_6_amd64_XFCE.iso diff --git a/molecules/sabayon-x86-corecdx.spec b/molecules/sabayon-x86-corecdx.spec index 6acea65..f2bb9a6 100644 --- a/molecules/sabayon-x86-corecdx.spec +++ b/molecules/sabayon-x86-corecdx.spec @@ -1,7 +1,7 @@ # use abs path, otherwise daily iso build automagic won't work %import /sabayon/molecules/corecdx.common -release_version: 5.5 +release_version: 6 release_desc: x86 CoreCDX # pre chroot command, example, for 32bit chroots on 64bit system, you always @@ -12,4 +12,4 @@ prechroot: linux32 source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso # Destination ISO image name, call whatever you want.iso, not mandatory -destination_iso_image_name: Sabayon_Linux_CoreCDX_5.5_x86.iso +destination_iso_image_name: Sabayon_Linux_CoreCDX_6_x86.iso diff --git a/molecules/sabayon-x86-e17.spec b/molecules/sabayon-x86-e17.spec index 355ca27..683ddf2 100644 --- a/molecules/sabayon-x86-e17.spec +++ b/molecules/sabayon-x86-e17.spec @@ -2,7 +2,7 @@ %import /sabayon/molecules/e17.common # Release Version -release_version: 5.5 +release_version: 6 # Release Version string description release_desc: x86 E17 @@ -14,4 +14,4 @@ prechroot: linux32 source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso # Destination ISO image name, call whatever you want.iso, not mandatory -destination_iso_image_name: Sabayon_Linux_5.5_x86_E17.iso +destination_iso_image_name: Sabayon_Linux_6_x86_E17.iso diff --git a/molecules/sabayon-x86-gaming.spec b/molecules/sabayon-x86-gaming.spec index 4657f12..a8ba661 100644 --- a/molecules/sabayon-x86-gaming.spec +++ b/molecules/sabayon-x86-gaming.spec @@ -5,7 +5,7 @@ prechroot: linux32 # Release Version -release_version: 5.5 +release_version: 6 # Release Version string description release_desc: x86 Gaming Edition @@ -14,4 +14,4 @@ release_desc: x86 Gaming Edition source_iso: /sabayon/iso/Sabayon_Linux_DAILY_x86_G.iso # Destination ISO image name, call whatever you want.iso, not mandatory -destination_iso_image_name: Sabayon_Linux_5.5_x86_Gaming.iso +destination_iso_image_name: Sabayon_Linux_6_x86_Gaming.iso diff --git a/molecules/sabayon-x86-gforensic.spec b/molecules/sabayon-x86-gforensic.spec index cc2e303..7b7c23e 100644 --- a/molecules/sabayon-x86-gforensic.spec +++ b/molecules/sabayon-x86-gforensic.spec @@ -15,7 +15,7 @@ release_string: Sabayon Linux release_file: /etc/sabayon-edition # Release Version -release_version: 5.5 +release_version: 6 # Release Version string description release_desc: x86 Gforensic @@ -59,7 +59,7 @@ extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat destination_iso_directory: /sabayon/iso # Destination ISO image name, call whatever you want.iso, not mandatory -destination_iso_image_name: Sabayon_Linux_Gforensic_5.5_x86.iso +destination_iso_image_name: Sabayon_Linux_Gforensic_6_x86.iso # Output iso image title iso_title: Sabayon_Linux_Forensic_x86_G diff --git a/molecules/sabayon-x86-gnome.spec b/molecules/sabayon-x86-gnome.spec index ba86627..0fd6555 100644 --- a/molecules/sabayon-x86-gnome.spec +++ b/molecules/sabayon-x86-gnome.spec @@ -4,7 +4,7 @@ prechroot: linux32 # Release Version -release_version: 5.5 +release_version: 6 # Release Version string description release_desc: x86 GNOME @@ -13,4 +13,4 @@ release_desc: x86 GNOME source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso # Destination ISO image name, call whatever you want.iso, not mandatory -destination_iso_image_name: Sabayon_Linux_5.5_x86_G.iso +destination_iso_image_name: Sabayon_Linux_6_x86_G.iso diff --git a/molecules/sabayon-x86-kde.spec b/molecules/sabayon-x86-kde.spec index 82b35e3..77ff6b4 100644 --- a/molecules/sabayon-x86-kde.spec +++ b/molecules/sabayon-x86-kde.spec @@ -4,7 +4,7 @@ prechroot: linux32 # Release Version -release_version: 5.5 +release_version: 6 # Release Version string description release_desc: x86 KDE @@ -13,4 +13,4 @@ release_desc: x86 KDE source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso # Destination ISO image name, call whatever you want.iso, not mandatory -destination_iso_image_name: Sabayon_Linux_5.5_x86_K.iso +destination_iso_image_name: Sabayon_Linux_6_x86_K.iso diff --git a/molecules/sabayon-x86-kforensic.spec b/molecules/sabayon-x86-kforensic.spec index 548fce9..7cd90b0 100644 --- a/molecules/sabayon-x86-kforensic.spec +++ b/molecules/sabayon-x86-kforensic.spec @@ -15,7 +15,7 @@ release_string: Sabayon Linux release_file: /etc/sabayon-edition # Release Version -release_version: 5.5 +release_version: 6 # Release Version string description release_desc: x86 Kforensic @@ -59,7 +59,7 @@ extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat destination_iso_directory: /sabayon/iso # Destination ISO image name, call whatever you want.iso, not mandatory -destination_iso_image_name: Sabayon_Linux_Kforensic_5.5_x86.iso +destination_iso_image_name: Sabayon_Linux_Kforensic_6_x86.iso # Output iso image title iso_title: Sabayon_Linux_Forensic_x86_K diff --git a/molecules/sabayon-x86-lxde.spec b/molecules/sabayon-x86-lxde.spec index d853a73..cbfb697 100644 --- a/molecules/sabayon-x86-lxde.spec +++ b/molecules/sabayon-x86-lxde.spec @@ -2,7 +2,7 @@ %import /sabayon/molecules/lxde.common # Release Version -release_version: 5.5 +release_version: 6 # Release Version string description release_desc: x86 LXDE @@ -14,4 +14,4 @@ prechroot: linux32 source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso # Destination ISO image name, call whatever you want.iso, not mandatory -destination_iso_image_name: Sabayon_Linux_5.5_x86_LXDE.iso +destination_iso_image_name: Sabayon_Linux_6_x86_LXDE.iso diff --git a/molecules/sabayon-x86-serverbase.spec b/molecules/sabayon-x86-serverbase.spec index 8ef542a..c886595 100644 --- a/molecules/sabayon-x86-serverbase.spec +++ b/molecules/sabayon-x86-serverbase.spec @@ -1,7 +1,7 @@ # use abs path, otherwise daily iso build automagic won't work %import /sabayon/molecules/serverbase.common -release_version: 5.5 +release_version: 6 release_desc: x86 ServerBase # pre chroot command, example, for 32bit chroots on 64bit system, you always @@ -12,4 +12,4 @@ prechroot: linux32 source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso # Destination ISO image name, call whatever you want.iso, not mandatory -destination_iso_image_name: Sabayon_Linux_ServerBase_5.5_x86.iso +destination_iso_image_name: Sabayon_Linux_ServerBase_6_x86.iso diff --git a/molecules/sabayon-x86-spinbase-openvz-template.spec b/molecules/sabayon-x86-spinbase-openvz-template.spec index 8d338ab..fb484ad 100644 --- a/molecules/sabayon-x86-spinbase-openvz-template.spec +++ b/molecules/sabayon-x86-spinbase-openvz-template.spec @@ -8,5 +8,5 @@ prechroot: linux32 # Path to source ISO file (MANDATORY) source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso -release_version: 5.5 -tar_name: Sabayon_Linux_SpinBase_5.5_x86_openvz.tar.gz +release_version: 6 +tar_name: Sabayon_Linux_SpinBase_6_x86_openvz.tar.gz diff --git a/molecules/sabayon-x86-spinbase.spec b/molecules/sabayon-x86-spinbase.spec index fb3bf70..e4eb166 100644 --- a/molecules/sabayon-x86-spinbase.spec +++ b/molecules/sabayon-x86-spinbase.spec @@ -6,7 +6,7 @@ prechroot: linux32 # Release Version # Keep this here, otherwise daily builds automagic won't work -release_version: 5.5 +release_version: 6 # Release Version string description release_desc: x86 SpinBase @@ -16,4 +16,4 @@ source_chroot: /sabayon/sources/x86_core-2010 # Destination ISO image name, call whatever you want.iso, not mandatory # Keep this here and set, otherwise daily builds automagic won't work -destination_iso_image_name: Sabayon_Linux_SpinBase_5.5_x86.iso +destination_iso_image_name: Sabayon_Linux_SpinBase_6_x86.iso diff --git a/molecules/sabayon-x86-xfce.spec b/molecules/sabayon-x86-xfce.spec index 154de42..aa2c553 100644 --- a/molecules/sabayon-x86-xfce.spec +++ b/molecules/sabayon-x86-xfce.spec @@ -2,7 +2,7 @@ %import /sabayon/molecules/xfce.common # Release Version -release_version: 5.5 +release_version: 6 # Release Version string description release_desc: x86 XFCE @@ -14,4 +14,4 @@ prechroot: linux32 source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso # Destination ISO image name, call whatever you want.iso, not mandatory -destination_iso_image_name: Sabayon_Linux_5.5_x86_XFCE.iso +destination_iso_image_name: Sabayon_Linux_6_x86_XFCE.iso diff --git a/scripts/generic_pre_iso_script.sh b/scripts/generic_pre_iso_script.sh index 82da6c7..47ae947 100755 --- a/scripts/generic_pre_iso_script.sh +++ b/scripts/generic_pre_iso_script.sh @@ -20,7 +20,7 @@ cp "${isolinux_source}" "${isolinux_destination}" || exit 1 ver=${RELEASE_VERSION} [[ -z "${ver}" ]] && ver=${CUR_DATE} -[[ -z "${ver}" ]] && ver="5.5" +[[ -z "${ver}" ]] && ver="6" sed -i "s/__VERSION__/${ver}/g" "${isolinux_destination}" sed -i "s/__FLAVOUR__/${remaster_type}/g" "${isolinux_destination}"