Commit 77cc0148 authored by Louis Abel's avatar Louis Abel 📺
Browse files

Merge branch 'devel' into 'main'

Devel

See merge request !41
parents 350ef6c8 e73ba201
Pipeline #122 passed with stage
in 31 seconds
...@@ -52,8 +52,10 @@ NONSIG_COMPOSE=( ...@@ -52,8 +52,10 @@ NONSIG_COMPOSE=(
) )
declare -A SIG_COMPOSE declare -A SIG_COMPOSE
#SIG_COMPOSE=( SIG_COMPOSE=(
#) [kernel]="kernel/kernel"
[kmod]="kernel/kmod"
)
# These repos have modules # These repos have modules
MODS=( MODS=(
...@@ -141,6 +143,7 @@ from configparser import ConfigParser ...@@ -141,6 +143,7 @@ from configparser import ConfigParser
config = ConfigParser() config = ConfigParser()
config.read('${TREEINFO_VAR}') config.read('${TREEINFO_VAR}')
config.set('tree', 'variants', 'BaseOS,AppStream') config.set('tree', 'variants', 'BaseOS,AppStream')
config.add_section('variant-AppStream')
config.set('variant-AppStream', 'id', 'AppStream') config.set('variant-AppStream', 'id', 'AppStream')
config.set('variant-AppStream', 'name', 'AppStream') config.set('variant-AppStream', 'name', 'AppStream')
config.set('variant-AppStream', 'type', 'variant') config.set('variant-AppStream', 'type', 'variant')
......
...@@ -27,20 +27,19 @@ done ...@@ -27,20 +27,19 @@ done
# sync all sig stuff # sync all sig stuff
# Disabled as we will have a different method for sig content and sig content # Only enabled for giving preferential treatment.
# is available upstream. for SIG in "${!SIG_COMPOSE[@]}"; do
#for SIG in "${!SIG_COMPOSE[@]}"; do echo "${SIG}: Syncing"
# echo "${SIG}: Syncing" cd "/mnt/compose/${MAJ}/latest-${SIG}-${MAJ}/compose" || { echo "${COMPOSE}: Failed to change directory"; break; }
# cd "/mnt/compose/${MAJ}/latest-${SIG}-${MAJ}/compose" || { echo "${COMPOSE}: Failed to change directory"; break; }
# TARGET="${STAGING_ROOT}/${CATEGORY_STUB}/${REV}/${SIG_COMPOSE[$SIG]}"
# TARGET="${STAGING_ROOT}/${CATEGORY_STUB}/${REV}/${SIG_COMPOSE[$SIG]}" mkdir -p "${TARGET}"
# mkdir -p "${TARGET}" # disabling because none of our files should be starting with dashes. If they
# # disabling because none of our files should be starting with dashes. If they # are something is *seriously* wrong here.
# # are something is *seriously* wrong here. # shellcheck disable=SC2035
# # shellcheck disable=SC2035 sudo -l && find **/* -maxdepth 0 -type d | parallel --will-cite -j 18 sudo rsync -av --chown=10004:10005 --progress --relative --human-readable \
# sudo -l && find **/* -maxdepth 0 -type d | parallel --will-cite -j 18 sudo rsync -av --chown=10004:10005 --progress --relative --human-readable \ {} "${TARGET}"
# {} "${TARGET}" done
#done
# copy around the ISOs a bit, make things comfortable # copy around the ISOs a bit, make things comfortable
for ARCH in "${ARCHES[@]}"; do for ARCH in "${ARCHES[@]}"; do
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment