sync from upstream script update

This commit is contained in:
Louis Abel 2024-08-19 22:00:38 -07:00
parent 851be399df
commit fba99cc185
Signed by: label
GPG Key ID: 2A6975660E424560
4 changed files with 54 additions and 34 deletions

View File

@ -34443,7 +34443,8 @@
"realmd.aarch64" "realmd.aarch64"
], ],
"rocky-release": [ "rocky-release": [
"rocky-release.aarch64" "rocky-release-eula.noarch",
"rocky-release.noarch"
], ],
"restore": [ "restore": [
"restore.aarch64" "restore.aarch64"
@ -36123,7 +36124,8 @@
"realmd.ppc64le" "realmd.ppc64le"
], ],
"rocky-release": [ "rocky-release": [
"rocky-release.ppc64le" "rocky-release-eula.noarch",
"rocky-release.noarch"
], ],
"restore": [ "restore": [
"restore.ppc64le" "restore.ppc64le"
@ -37749,7 +37751,8 @@
"realmd.s390x" "realmd.s390x"
], ],
"rocky-release": [ "rocky-release": [
"rocky-release.s390x" "rocky-release-eula.noarch",
"rocky-release.noarch"
], ],
"restore": [ "restore": [
"restore.s390x" "restore.s390x"
@ -39659,7 +39662,8 @@
"realmd.x86_64" "realmd.x86_64"
], ],
"rocky-release": [ "rocky-release": [
"rocky-release.x86_64" "rocky-release-eula.noarch",
"rocky-release.noarch"
], ],
"restore": [ "restore": [
"restore.x86_64" "restore.x86_64"
@ -42320,7 +42324,7 @@
"rasqal-devel.aarch64" "rasqal-devel.aarch64"
], ],
"rocky-release": [ "rocky-release": [
"rocky-rb-certs.noarch" "rocky-sb-certs.noarch"
], ],
"redland": [ "redland": [
"redland-devel.aarch64" "redland-devel.aarch64"
@ -44977,7 +44981,7 @@
"rasqal-devel.ppc64le" "rasqal-devel.ppc64le"
], ],
"rocky-release": [ "rocky-release": [
"rocky-rb-certs.noarch" "rocky-sb-certs.noarch"
], ],
"redland": [ "redland": [
"redland-devel.ppc64le" "redland-devel.ppc64le"
@ -47591,7 +47595,7 @@
"rasqal-devel.s390x" "rasqal-devel.s390x"
], ],
"rocky-release": [ "rocky-release": [
"rocky-rb-certs.noarch" "rocky-sb-certs.noarch"
], ],
"redland": [ "redland": [
"redland-devel.s390x" "redland-devel.s390x"
@ -50795,7 +50799,7 @@
"rasqal-devel.x86_64" "rasqal-devel.x86_64"
], ],
"rocky-release": [ "rocky-release": [
"rocky-rb-certs.noarch" "rocky-sb-certs.noarch"
], ],
"redland": [ "redland": [
"redland-devel.i686", "redland-devel.i686",

View File

@ -26886,7 +26886,8 @@ BaseOS:
rng-tools: rng-tools:
- rng-tools.aarch64 - rng-tools.aarch64
rocky-release: rocky-release:
- rocky-release.aarch64 - rocky-release-eula.noarch
- rocky-release.noarch
rootfiles: rootfiles:
- rootfiles.noarch - rootfiles.noarch
rpcbind: rpcbind:
@ -28173,7 +28174,8 @@ BaseOS:
rng-tools: rng-tools:
- rng-tools.ppc64le - rng-tools.ppc64le
rocky-release: rocky-release:
- rocky-release.ppc64le - rocky-release-eula.noarch
- rocky-release.noarch
rootfiles: rootfiles:
- rootfiles.noarch - rootfiles.noarch
rpcbind: rpcbind:
@ -29421,7 +29423,8 @@ BaseOS:
rng-tools: rng-tools:
- rng-tools.s390x - rng-tools.s390x
rocky-release: rocky-release:
- rocky-release.s390x - rocky-release-eula.noarch
- rocky-release.noarch
rootfiles: rootfiles:
- rootfiles.noarch - rootfiles.noarch
rpcbind: rpcbind:
@ -30934,7 +30937,8 @@ BaseOS:
rng-tools: rng-tools:
- rng-tools.x86_64 - rng-tools.x86_64
rocky-release: rocky-release:
- rocky-release.x86_64 - rocky-release-eula.noarch
- rocky-release.noarch
rootfiles: rootfiles:
- rootfiles.noarch - rootfiles.noarch
rpcbind: rpcbind:
@ -32853,7 +32857,7 @@ CRB:
rhc: rhc:
- rhc-devel.aarch64 - rhc-devel.aarch64
rocky-release: rocky-release:
- rocky-rb-certs.noarch - rocky-sb-certs.noarch
rpcsvc-proto: rpcsvc-proto:
- rpcsvc-proto-devel.aarch64 - rpcsvc-proto-devel.aarch64
rrdtool: rrdtool:
@ -34734,7 +34738,7 @@ CRB:
rhc: rhc:
- rhc-devel.ppc64le - rhc-devel.ppc64le
rocky-release: rocky-release:
- rocky-rb-certs.noarch - rocky-sb-certs.noarch
rpcsvc-proto: rpcsvc-proto:
- rpcsvc-proto-devel.ppc64le - rpcsvc-proto-devel.ppc64le
rrdtool: rrdtool:
@ -36580,7 +36584,7 @@ CRB:
rhc: rhc:
- rhc-devel.s390x - rhc-devel.s390x
rocky-release: rocky-release:
- rocky-rb-certs.noarch - rocky-sb-certs.noarch
rpcsvc-proto: rpcsvc-proto:
- rpcsvc-proto-devel.s390x - rpcsvc-proto-devel.s390x
rrdtool: rrdtool:
@ -38989,7 +38993,7 @@ CRB:
rhc: rhc:
- rhc-devel.x86_64 - rhc-devel.x86_64
rocky-release: rocky-release:
- rocky-rb-certs.noarch - rocky-sb-certs.noarch
rpcsvc-proto: rpcsvc-proto:
- rpcsvc-proto-devel.i686 - rpcsvc-proto-devel.i686
- rpcsvc-proto-devel.x86_64 - rpcsvc-proto-devel.x86_64

View File

@ -14,8 +14,6 @@ filter_packages = [
"*openh264*", # https://fedoraproject.org/wiki/Non-distributable-rpms "*openh264*", # https://fedoraproject.org/wiki/Non-distributable-rpms
"python3-openipmi", #RhBug 1982794 "python3-openipmi", #RhBug 1982794
"OpenIPMI-perl", #RhBug 1982794 "OpenIPMI-perl", #RhBug 1982794
"rhc",
"rhc-worker-playbook"
] ]
"ppc64le": [ "ppc64le": [
"SLOF", "SLOF",

View File

@ -1,20 +1,34 @@
#!/bin/bash #!/bin/bash
HOWMANY="-$1" set -e
if [ -z $1 ]; then echo "Cloning upstream pungi"
HOWMANY="-1" git clone https://gitlab.com/redhat/centos-stream/release-engineering/pungi-centos.git -b centos-9-stream /var/tmp/c9s
echo "Copying shared data"
if [ -d "shared" ]; then
/bin/cp /var/tmp/c9s/shared/* shared/
fi fi
BRANCH=$(git branch --show-current) echo "Copying prepopulate"
if [[ ! "${BRANCH}" =~ "r9s" ]]; then /bin/cp /var/tmp/c9s/prepopulate.json .
echo "Not a lookahead branch."
exit 1
fi
echo "Fetching from upstream" echo "Changing to rocky where required in prepopulate"
git fetch https://gitlab.com/redhat/centos-stream/release-engineering/pungi-centos.git centos-9-stream while read -r pattern; do
echo "Formatting patch and applying..." sscript+="$pattern;"
git format-patch --stdout ${HOWMANY} FETCH_HEAD | sed -e 's|centos/|rocky/|' | git apply done <<EOF
echo "!! DIFF OF CHANGES !!" s/"redhat-release"/"rocky-release"/g
git --no-pager diff HEAD s/"redhat-release\..*"/"rocky-release.noarch"/g
s/"redhat-release-eula\..*"/"rocky-release-eula.noarch"/g
s/"redhat-indexhtml/"rocky-indexhtml/g
s/"redhat-logos/"rocky-logos/g
s/"redhat-backgrounds/"rocky-backgrounds/g
s/"redhat-sb-certs/"rocky-sb-certs/g
EOF
sed -i "$sscript" prepopulate.json
echo "You may now commit and push." echo "Generating yaml"
/bin/bash ./generate-prepop-yaml
rm -rf /var/tmp/c9s
git status
echo "Completed. Check status above."