xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 17:23:08 +00:00
Code Issues Releases Wiki Activity

Merge pull request #7437 from xcat2/consortium

Browse Source 
Do not rely on GPG key id
This commit is contained in:
Obihörnchen 2024-04-23 20:52:25 +02:00 committed by GitHub
commit 549e6ba5ca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build-ubunturepo
View File

@ -373,7 +373,8 @@ __EOF__
#echo "GPGSIGN=$GPGSIGN specified, the repo will not be signed"
echo "" >> conf/distributions
else
echo "SignWith: 5619700D" >> conf/distributions
keyid=$(gpg --list-keys --keyid-format long "xCAT Automatic Signing Key" | grep '^pub' | sed -e 's/.*\///' -e 's/ .*//')
echo "SignWith: $keyid" >> conf/distributions
echo "" >> conf/distributions
fi
done
@ -514,7 +515,8 @@ __EOF__
echo "GPGSIGN=$GPGSIGN specified, the repo will not be signed"
echo "" >> conf/distributions
else
echo "SignWith: 5619700D" >> conf/distributions
keyid=$(gpg --list-keys --keyid-format long "xCAT Automatic Signing Key" | grep '^pub' | sed -e 's/.*\///' -e 's/ .*//')
echo "SignWith: $keyid" >> conf/distributions
echo "" >> conf/distributions
fi

8
buildcore.sh
View File

@ -479,13 +479,13 @@ if [ "$OSNAME" != "AIX" ]; then
rm -f $SRCDIR/repodata/repomd.xml.asc
rm -f $DESTDIR/repodata/repomd.xml.asc
# Use the xCAT Automatic Signing Key to do the signing
gpg -a --detach-sign --default-key 5619700D $DESTDIR/repodata/repomd.xml
gpg -a --detach-sign --default-key 5619700D $SRCDIR/repodata/repomd.xml
gpg -a --detach-sign --default-key "xCAT Automatic Signing Key" $DESTDIR/repodata/repomd.xml
gpg -a --detach-sign --default-key "xCAT Automatic Signing Key" $SRCDIR/repodata/repomd.xml
if [ ! -f $DESTDIR/repodata/repomd.xml.key ]; then
${WGET_CMD} --no-check-certificate -q -P $DESTDIR/repodata $GSA/keys/repomd.xml.key
gpg -a --export "xCAT Automatic Signing Key" > $DESTDIR/repodata/repomd.xml.key
fi
if [ ! -f $SRCDIR/repodata/repomd.xml.key ]; then
${WGET_CMD} --no-check-certificate -P $SRCDIR/repodata $GSA/keys/repomd.xml.key
gpg -a --export "xCAT Automatic Signing Key" > $SRCDIR/repodata/repomd.xml.key
fi
else
createrepo $DESTDIR

4
builddep.sh
View File

@ -265,9 +265,9 @@ for i in `find -mindepth 2 -maxdepth 2 -type d `; do
createrepo $i >/dev/null
fi
rm -f $i/repodata/repomd.xml.asc
gpg -a --detach-sign --default-key 5619700D $i/repodata/repomd.xml
gpg -a --detach-sign --default-key "xCAT Automatic Signing Key" $i/repodata/repomd.xml
if [ ! -f $i/repodata/repomd.xml.key ]; then
cp $GSA/../keys/repomd.xml.key $i/repodata
gpg -a --export "xCAT Automatic Signing Key" > $i/repodata/repomd.xml.key
fi
done

1
xCAT-server/share/xcat/install/rh/service.rhels9.pkglist
View File

@ -14,3 +14,4 @@ python3
tar
bzip2
perl-interpreter
perl-lib

2
xCAT-server/share/xcat/install/rh/service.rhels9.ppc64le.otherpkgs.pkglist
View File

@ -1,2 +1,2 @@
xcat/xcat-core/xCATsn
xcat/xcat-dep/rh8/ppc64le/goconserver
xcat/xcat-dep/rh9/ppc64le/goconserver

2
xCAT-server/share/xcat/install/rh/service.rhels9.x86_64.otherpkgs.pkglist
View File

@ -1,2 +1,2 @@
xcat/xcat-core/xCATsn
xcat/xcat-dep/rh8/x86_64/goconserver
xcat/xcat-dep/rh9/x86_64/goconserver

2
xCAT-server/share/xcat/netboot/rh/service.rhels9.ppc64le.otherpkgs.pkglist
View File

@ -1,2 +1,2 @@
xcat/xcat-core/xCATsn
xcat/xcat-dep/rh8/ppc64le/goconserver
xcat/xcat-dep/rh9/ppc64le/goconserver

2
xCAT-server/share/xcat/netboot/rh/service.rhels9.x86_64.otherpkgs.pkglist
View File

@ -1,2 +1,2 @@
xcat/xcat-core/xCATsn
xcat/xcat-dep/rh8/x86_64/goconserver
xcat/xcat-dep/rh9/x86_64/goconserver

1
xCAT-server/share/xcat/netboot/rh/service.rhels9.x86_64.pkglist
View File

@ -10,6 +10,7 @@ util-linux
wget
perl-DBD-MySQL
perl-DBD-Pg
perl-lib
python3
tar
bzip2