Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not rely on GPG key id #7437

Merged
merged 3 commits into from
Apr 23, 2024
Merged

Do not rely on GPG key id #7437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7f3bdb
Do not rely on GPG key id
Obihoernchen Apr 19, 2024
55d6d13
Add perl-lib required for xCAT on EL9
Obihoernchen Apr 21, 2024
a5ed2d6
Fix goconserver path for EL9
Obihoernchen Apr 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions build-ubunturepo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions buildcore.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions builddep.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions xCAT-server/share/xcat/install/rh/service.rhels9.pkglist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ python3
tar
bzip2
perl-interpreter
perl-lib
2 changes: 1 addition & 1 deletion xCAT-server/share/xcat/install/rh/service.rhels9.ppc64le.otherpkgs.pkglist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
xcat/xcat-core/xCATsn
xcat/xcat-dep/rh8/ppc64le/goconserver
xcat/xcat-dep/rh9/ppc64le/goconserver
2 changes: 1 addition & 1 deletion xCAT-server/share/xcat/install/rh/service.rhels9.x86_64.otherpkgs.pkglist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
xcat/xcat-core/xCATsn
xcat/xcat-dep/rh8/x86_64/goconserver
xcat/xcat-dep/rh9/x86_64/goconserver
2 changes: 1 addition & 1 deletion xCAT-server/share/xcat/netboot/rh/service.rhels9.ppc64le.otherpkgs.pkglist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
xcat/xcat-core/xCATsn
xcat/xcat-dep/rh8/ppc64le/goconserver
xcat/xcat-dep/rh9/ppc64le/goconserver
2 changes: 1 addition & 1 deletion xCAT-server/share/xcat/netboot/rh/service.rhels9.x86_64.otherpkgs.pkglist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
xcat/xcat-core/xCATsn
xcat/xcat-dep/rh8/x86_64/goconserver
xcat/xcat-dep/rh9/x86_64/goconserver
1 change: 1 addition & 0 deletions xCAT-server/share/xcat/netboot/rh/service.rhels9.x86_64.pkglist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ util-linux
wget
perl-DBD-MySQL
perl-DBD-Pg
perl-lib
python3
tar
bzip2
Expand Down