diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191111.4-disable_force_fix b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191111.4-fix_migrate_state similarity index 90% rename from profiles/templates/3.6/6_ac_update_sync/revision/2019/20191111.4-disable_force_fix rename to profiles/templates/3.6/6_ac_update_sync/revision/2019/20191111.4-fix_migrate_state index 84dff4a3a..ac81b3161 100644 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191111.4-disable_force_fix +++ b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191111.4-fix_migrate_state @@ -3,4 +3,4 @@ #-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# [update] -!cl_update_force_fix_set= +cl_update_force_fix_set=on diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191115.1-rebuild_lib32 b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191115.1-rebuild_lib32 index 60004e98b..eb5aaa9b2 100644 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191115.1-rebuild_lib32 +++ b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191115.1-rebuild_lib32 @@ -1,4 +1,4 @@ -# Calculate name=ini.env format=samba os_arch_machine==x86_64 ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# merge=app-accessibility/at-spi2-atk,app-accessibility/at-spi2-core,app-arch/bzip2,app-emulation/wine-vanilla,app-shells/scsh,dev-db/mysql-connector-c,dev-db/sqlite,dev-lang/orc,dev-libs/atk,dev-libs/elfutils,dev-libs/expat,dev-libs/fribidi,dev-libs/glib,dev-libs/gmp,dev-libs/icu,dev-libs/json-c,dev-libs/libcroco,dev-libs/libffi,dev-libs/libgcrypt,dev-libs/libgpg-error,dev-libs/libltdl,dev-libs/libpcre,dev-libs/libpthread-stubs,dev-libs/libtasn1,dev-libs/libunistring,dev-libs/libusb,dev-libs/libusb-compat,dev-libs/libxml2,dev-libs/libxslt,dev-libs/lzo,dev-libs/nettle,dev-libs/ocl-icd,dev-libs/openssl,dev-libs/popt,dev-libs/wayland,gnome-base/librsvg,media-gfx/graphite2,media-gfx/nvidia-cg-toolkit,media-gfx/sane-backends,media-libs/alsa-lib,media-libs/alsa-oss,media-libs/audiofile,media-libs/faac,media-libs/flac,media-libs/fontconfig,media-libs/freeglut,media-libs/freetype,media-libs/gd,media-libs/glu,media-libs/graphene,media-libs/gst-plugins-base,media-libs/gstreamer,media-libs/harfbuzz,media-libs/lcms,media-libs/libaom,media-libs/libdc1394,media-libs/libepoxy,media-libs/libexif,media-libs/libgphoto2,media-libs/libjpeg-turbo,media-libs/libmad,media-libs/libmikmod,media-libs/libmng,media-libs/libogg,media-libs/libpng,media-libs/libsdl,media-libs/libsdl2,media-libs/libsndfile,media-libs/libtheora,media-libs/libv4l,media-libs/libvorbis,media-libs/libvpx,media-libs/libwebp,media-libs/mesa,media-libs/nv-codec-headers,media-libs/openal,media-libs/opencore-amr,media-libs/openjpeg,media-libs/opus,media-libs/portaudio,media-libs/sdl-mixer,media-libs/smpeg,media-libs/speex,media-libs/speexdsp,media-libs/tiff,media-libs/vo-aacenc,media-libs/x264,media-libs/x265,media-libs/xvid,media-plugins/alsa-plugins,media-sound/lame,media-sound/mpg123,media-sound/pulseaudio,media-sound/wavpack,media-video/ffmpeg,net-dns/libidn2,net-libs/gnutls,net-libs/libasyncns,net-libs/srt,net-nds/openldap,net-print/cndrvcups-capt,net-print/cndrvcups-common,net-print/cndrvcups-common-lb,net-print/cndrvcups-lb,net-print/cups,sys-apps/attr,sys-apps/dbus,sys-apps/lm-sensors,sys-apps/sandbox,sys-apps/tcp-wrappers,sys-apps/util-linux,sys-devel/binutils,sys-devel/clang,sys-devel/flex,sys-devel/gcc,sys-devel/gettext,sys-devel/llvm,sys-fs/eudev,sys-libs/binutils-libs,sys-libs/cracklib,sys-libs/db,sys-libs/glibc,sys-libs/gpm,sys-libs/libcap,sys-libs/libraw1394,sys-libs/libstdc++-v3,sys-libs/ncurses,sys-libs/pam,sys-libs/readline,sys-libs/zlib,x11-base/xcb-proto,x11-drivers/nvidia-drivers,x11-libs/cairo,x11-libs/gdk-pixbuf,x11-libs/gtk+,x11-libs/libdrm,x11-libs/libICE,x11-libs/libpciaccess,x11-libs/libSM,x11-libs/libva,x11-libs/libva-intel-driver,x11-libs/libva-vdpau-driver,x11-libs/libvdpau,x11-libs/libX11,x11-libs/libXau,x11-libs/libxcb,x11-libs/libXcomposite,x11-libs/libXcursor,x11-libs/libXdamage,x11-libs/libXdmcp,x11-libs/libXext,x11-libs/libXfixes,x11-libs/libXft,x11-libs/libXi,x11-libs/libXinerama,x11-libs/libxkbcommon,x11-libs/libXmu,x11-libs/libXrandr,x11-libs/libXrender,x11-libs/libXScrnSaver,x11-libs/libxshmfence,x11-libs/libXt,x11-libs/libXtst,x11-libs/libXv,x11-libs/libXvMC,x11-libs/libXxf86dga,x11-libs/libXxf86vm,x11-libs/pango,x11-libs/pixman +# Calculate name=ini.env format=samba os_arch_machine==x86_64 ini(overlay-calculate.revision)=>20191111.4,#-cut(0,-,#-cl_pass_file-#)-# merge=app-accessibility/at-spi2-atk,app-accessibility/at-spi2-core,app-arch/bzip2,app-emulation/wine-vanilla,app-shells/scsh,dev-db/mysql-connector-c,dev-db/sqlite,dev-lang/orc,dev-libs/atk,dev-libs/elfutils,dev-libs/expat,dev-libs/fribidi,dev-libs/glib,dev-libs/gmp,dev-libs/icu,dev-libs/json-c,dev-libs/libcroco,dev-libs/libffi,dev-libs/libgcrypt,dev-libs/libgpg-error,dev-libs/libltdl,dev-libs/libpcre,dev-libs/libpthread-stubs,dev-libs/libtasn1,dev-libs/libunistring,dev-libs/libusb,dev-libs/libusb-compat,dev-libs/libxml2,dev-libs/libxslt,dev-libs/lzo,dev-libs/nettle,dev-libs/ocl-icd,dev-libs/openssl,dev-libs/popt,dev-libs/wayland,gnome-base/librsvg,media-gfx/graphite2,media-gfx/nvidia-cg-toolkit,media-gfx/sane-backends,media-libs/alsa-lib,media-libs/alsa-oss,media-libs/audiofile,media-libs/faac,media-libs/flac,media-libs/fontconfig,media-libs/freeglut,media-libs/freetype,media-libs/gd,media-libs/glu,media-libs/graphene,media-libs/gst-plugins-base,media-libs/gstreamer,media-libs/harfbuzz,media-libs/lcms,media-libs/libaom,media-libs/libdc1394,media-libs/libepoxy,media-libs/libexif,media-libs/libgphoto2,media-libs/libjpeg-turbo,media-libs/libmad,media-libs/libmikmod,media-libs/libmng,media-libs/libogg,media-libs/libpng,media-libs/libsdl,media-libs/libsdl2,media-libs/libsndfile,media-libs/libtheora,media-libs/libv4l,media-libs/libvorbis,media-libs/libvpx,media-libs/libwebp,media-libs/mesa,media-libs/nv-codec-headers,media-libs/openal,media-libs/opencore-amr,media-libs/openjpeg,media-libs/opus,media-libs/portaudio,media-libs/sdl-mixer,media-libs/smpeg,media-libs/speex,media-libs/speexdsp,media-libs/tiff,media-libs/vo-aacenc,media-libs/x264,media-libs/x265,media-libs/xvid,media-plugins/alsa-plugins,media-sound/lame,media-sound/mpg123,media-sound/pulseaudio,media-sound/wavpack,media-video/ffmpeg,net-dns/libidn2,net-libs/gnutls,net-libs/libasyncns,net-libs/srt,net-nds/openldap,net-print/cndrvcups-capt,net-print/cndrvcups-common,net-print/cndrvcups-common-lb,net-print/cndrvcups-lb,net-print/cups,sys-apps/attr,sys-apps/dbus,sys-apps/lm-sensors,sys-apps/sandbox,sys-apps/tcp-wrappers,sys-apps/util-linux,sys-devel/binutils,sys-devel/clang,sys-devel/flex,sys-devel/gcc,sys-devel/gettext,sys-devel/llvm,sys-fs/eudev,sys-libs/binutils-libs,sys-libs/cracklib,sys-libs/db,sys-libs/glibc,sys-libs/gpm,sys-libs/libcap,sys-libs/libraw1394,sys-libs/libstdc++-v3,sys-libs/ncurses,sys-libs/pam,sys-libs/readline,sys-libs/zlib,x11-base/xcb-proto,x11-drivers/nvidia-drivers,x11-libs/cairo,x11-libs/gdk-pixbuf,x11-libs/gtk+,x11-libs/libdrm,x11-libs/libICE,x11-libs/libpciaccess,x11-libs/libSM,x11-libs/libva,x11-libs/libva-intel-driver,x11-libs/libva-vdpau-driver,x11-libs/libvdpau,x11-libs/libX11,x11-libs/libXau,x11-libs/libxcb,x11-libs/libXcomposite,x11-libs/libXcursor,x11-libs/libXdamage,x11-libs/libXdmcp,x11-libs/libXext,x11-libs/libXfixes,x11-libs/libXft,x11-libs/libXi,x11-libs/libXinerama,x11-libs/libxkbcommon,x11-libs/libXmu,x11-libs/libXrandr,x11-libs/libXrender,x11-libs/libXScrnSaver,x11-libs/libxshmfence,x11-libs/libXt,x11-libs/libXtst,x11-libs/libXv,x11-libs/libXvMC,x11-libs/libXxf86dga,x11-libs/libXxf86vm,x11-libs/pango,x11-libs/pixman [overlay-calculate] revision = #-cut(0,-,#-cl_pass_file-#)-# diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191115.2-rebuild_gcc_binutils_glibc b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191115.2-rebuild_gcc_binutils_glibc index 270baf39a..5c2824427 100644 --- a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191115.2-rebuild_gcc_binutils_glibc +++ b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191115.2-rebuild_gcc_binutils_glibc @@ -1,6 +1,4 @@ -# Calculate run=/bin/bash os_arch_machine==x86_64 ini(overlay-calculate.revision)<#-cut(0,-,#-cl_pass_file-#)-# - -#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# +# Calculate run=/bin/bash os_arch_machine==x86_64 cl_chroot_status==on||cl_update_sync_only_set==off&&cl_update_autocheck_schedule_set==off ini(overlay-calculate.revision)=>20191111.4,#-cut(0,-,#-cl_pass_file-#)-# echo "A new set of 17.1 amd64 Gentoo profiles has been selected." echo "Rebuild sys-devel/gcc" diff --git a/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191115.3-disable_force_fix b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191115.3-disable_force_fix new file mode 100644 index 000000000..f243b3adc --- /dev/null +++ b/profiles/templates/3.6/6_ac_update_sync/revision/2019/20191115.3-disable_force_fix @@ -0,0 +1,6 @@ +# Calculate format=samba path=/var/lib/calculate name=calculate.env cl_chroot_status==on||cl_update_sync_only_set==off&&cl_update_autocheck_schedule_set==off ini(overlay-calculate.revision)=>20191111.4,#-cut(0,-,#-cl_pass_file-#)-# + +#-ini(overlay-calculate.revision,#-cut(0,-,#-cl_pass_file-#)-#)-# + +[update] +!cl_update_force_fix_set=