From fbada86ec6337f739cf2200782db9412f7f79ea0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 9 Mar 2023 14:39:12 +0100 Subject: cleanup SCL configs --- fc37xscl74.cfg | 5 +++-- fc37xscl80.cfg | 5 +++-- fc37xscl81.cfg | 5 +++-- fc37xscl82.cfg | 5 +++-- fc38xscl74.cfg | 5 +++-- fc38xscl80.cfg | 5 +++-- fc38xscl81.cfg | 5 +++-- fc38xscl82.cfg | 5 +++-- 8 files changed, 24 insertions(+), 16 deletions(-) diff --git a/fc37xscl74.cfg b/fc37xscl74.cfg index 96f1c4b..30e3fb8 100644 --- a/fc37xscl74.cfg +++ b/fc37xscl74.cfg @@ -5,8 +5,9 @@ config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-buil config_opts['resultdir'] = "/var/lib/mock/scl74fc37x" config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc37xscl74/" -config_opts['macros']['%scl_vendor']="remi" -config_opts['macros']['%_scl_prefix']="/opt/remi" +# Only needed to build main SCL package +#config_opts['macros']['%scl_vendor']="remi" +#config_opts['macros']['%_scl_prefix']="/opt/remi" config_opts['macros']['%nophptag']="1" # Official (but temporary) workaround for https://bugzilla.redhat.com/1484370 diff --git a/fc37xscl80.cfg b/fc37xscl80.cfg index ca5e383..0c8154b 100644 --- a/fc37xscl80.cfg +++ b/fc37xscl80.cfg @@ -5,8 +5,9 @@ config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-buil config_opts['resultdir'] = "/var/lib/mock/scl80fc37x" config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc37xscl80/" -config_opts['macros']['%scl_vendor']="remi" -config_opts['macros']['%_scl_prefix']="/opt/remi" +# Only needed to build main SCL package +#config_opts['macros']['%scl_vendor']="remi" +#config_opts['macros']['%_scl_prefix']="/opt/remi" config_opts['macros']['%nophptag']="1" # Official (but temporary) workaround for https://bugzilla.redhat.com/1484370 diff --git a/fc37xscl81.cfg b/fc37xscl81.cfg index 569f4b3..15cd1d4 100644 --- a/fc37xscl81.cfg +++ b/fc37xscl81.cfg @@ -5,8 +5,9 @@ config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-buil config_opts['resultdir'] = "/var/lib/mock/scl81fc37x" config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc37xscl81/" -config_opts['macros']['%scl_vendor']="remi" -config_opts['macros']['%_scl_prefix']="/opt/remi" +# Only needed to build main SCL package +#config_opts['macros']['%scl_vendor']="remi" +#config_opts['macros']['%_scl_prefix']="/opt/remi" config_opts['macros']['%nophptag']="1" # Official (but temporary) workaround for https://bugzilla.redhat.com/1484370 diff --git a/fc37xscl82.cfg b/fc37xscl82.cfg index 10c77c6..ba990e2 100644 --- a/fc37xscl82.cfg +++ b/fc37xscl82.cfg @@ -5,8 +5,9 @@ config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-buil config_opts['resultdir'] = "/var/lib/mock/scl82fc37x" config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc37xscl82/" -config_opts['macros']['%scl_vendor']="remi" -config_opts['macros']['%_scl_prefix']="/opt/remi" +# Only needed to build main SCL package +#config_opts['macros']['%scl_vendor']="remi" +#config_opts['macros']['%_scl_prefix']="/opt/remi" config_opts['macros']['%nophptag']="1" # Official (but temporary) workaround for https://bugzilla.redhat.com/1484370 diff --git a/fc38xscl74.cfg b/fc38xscl74.cfg index 3e768b3..b9ef402 100644 --- a/fc38xscl74.cfg +++ b/fc38xscl74.cfg @@ -5,8 +5,9 @@ config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-buil config_opts['resultdir'] = "/var/lib/mock/scl74fc38x" config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc38xscl74/" -config_opts['macros']['%scl_vendor']="remi" -config_opts['macros']['%_scl_prefix']="/opt/remi" +# Only needed to build main SCL package +#config_opts['macros']['%scl_vendor']="remi" +#config_opts['macros']['%_scl_prefix']="/opt/remi" config_opts['macros']['%nophptag']="1" # Official (but temporary) workaround for https://bugzilla.redhat.com/1484380 diff --git a/fc38xscl80.cfg b/fc38xscl80.cfg index a771f53..4fb0c94 100644 --- a/fc38xscl80.cfg +++ b/fc38xscl80.cfg @@ -5,8 +5,9 @@ config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-buil config_opts['resultdir'] = "/var/lib/mock/scl80fc38x" config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc38xscl80/" -config_opts['macros']['%scl_vendor']="remi" -config_opts['macros']['%_scl_prefix']="/opt/remi" +# Only needed to build main SCL package +#config_opts['macros']['%scl_vendor']="remi" +#config_opts['macros']['%_scl_prefix']="/opt/remi" config_opts['macros']['%nophptag']="1" # Official (but temporary) workaround for https://bugzilla.redhat.com/1484380 diff --git a/fc38xscl81.cfg b/fc38xscl81.cfg index a60e143..ad9f547 100644 --- a/fc38xscl81.cfg +++ b/fc38xscl81.cfg @@ -5,8 +5,9 @@ config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-buil config_opts['resultdir'] = "/var/lib/mock/scl81fc38x" config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc38xscl81/" -config_opts['macros']['%scl_vendor']="remi" -config_opts['macros']['%_scl_prefix']="/opt/remi" +# Only needed to build main SCL package +#config_opts['macros']['%scl_vendor']="remi" +#config_opts['macros']['%_scl_prefix']="/opt/remi" config_opts['macros']['%nophptag']="1" # Official (but temporary) workaround for https://bugzilla.redhat.com/1484380 diff --git a/fc38xscl82.cfg b/fc38xscl82.cfg index db8d8f7..c827f70 100644 --- a/fc38xscl82.cfg +++ b/fc38xscl82.cfg @@ -5,8 +5,9 @@ config_opts['chroot_setup_cmd'] = 'install @buildsys-build ccache scl-utils-buil config_opts['resultdir'] = "/var/lib/mock/scl82fc38x" config_opts['plugin_conf']['ccache_opts']['dir'] = "/dev/shm/ccache.fc38xscl82/" -config_opts['macros']['%scl_vendor']="remi" -config_opts['macros']['%_scl_prefix']="/opt/remi" +# Only needed to build main SCL package +#config_opts['macros']['%scl_vendor']="remi" +#config_opts['macros']['%_scl_prefix']="/opt/remi" config_opts['macros']['%nophptag']="1" # Official (but temporary) workaround for https://bugzilla.redhat.com/1484380 -- cgit