Use versioned gpg keys to work around Fedora 11's rpms having broken backward compatibility on checksums.

This commit is contained in:
Ralf Corsepius
2009-04-30 03:47:59 +00:00
parent b1a2a4bab1
commit 16bde857e1
2 changed files with 30 additions and 12 deletions

View File

@@ -29,23 +29,41 @@ yum.repos.d/rtems-@RTEMS_API@.repo: yum.repos.d/rtems.repo.in
-e 's,[@]RTEMS_API[@],@RTEMS_API@,' \ -e 's,[@]RTEMS_API[@],@RTEMS_API@,' \
-e 's,[@]OS_SUBDIR[@],@OS_SUBDIR@,' \ -e 's,[@]OS_SUBDIR[@],@OS_SUBDIR@,' \
-e 's,[@]OS_NAME[@],@OS_NAME@,' \ -e 's,[@]OS_NAME[@],@OS_NAME@,' \
-e 's,[@]OS_VERS[@],@OS_VERS@,' \
-e 's,[@]YUM_VERDIR[@],@YUM_VERDIR@,' \ -e 's,[@]YUM_VERDIR[@],@YUM_VERDIR@,' \
< $(srcdir)/yum.repos.d/rtems.repo.in \ < $(srcdir)/yum.repos.d/rtems.repo.in \
> yum.repos.d/rtems-@RTEMS_API@.repo > yum.repos.d/rtems-@RTEMS_API@.repo
CLEANFILES += yum.repos.d/rtems-@RTEMS_API@.repo CLEANFILES += yum.repos.d/rtems-@RTEMS_API@.repo
EXTRA_DIST += $(srcdir)/yum.repos.d/*repo.in EXTRA_DIST += $(srcdir)/yum.repos.d/*repo.in
gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@: gpg/gpg-pubkey-69ce4a83-44cc2b30
@$(mkdir_p) gpg
sed -e 's,[@]OS_SUBDIR[@],@OS_SUBDIR@,' \
-e 's,[@]OS_VERS[@],@OS_VERS@,' \
< $(srcdir)/gpg/gpg-pubkey-69ce4a83-44cc2b30 \
> gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
CLEANFILES += gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
EXTRA_DIST += $(srcdir)/gpg/gpg-pubkey-69ce4a83-44cc2b30
gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@: gpg/gpg-pubkey-eac29b6f-3fe1f458
@$(mkdir_p) gpg
sed -e 's,[@]OS_SUBDIR[@],@OS_SUBDIR@,' \
-e 's,[@]OS_VERS[@],@OS_VERS@,' \
< $(srcdir)/gpg/gpg-pubkey-eac29b6f-3fe1f458 \
> gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
CLEANFILES += gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
EXTRA_DIST += $(srcdir)/gpg/gpg-pubkey-eac29b6f-3fe1f458
yum_gpgdir = $(sysconfdir)/pki/rpm-gpg yum_gpgdir = $(sysconfdir)/pki/rpm-gpg
yum_gpg_DATA = yum_gpg_DATA =
yum_gpg_DATA += gpg/gpg-pubkey-69ce4a83-44cc2b30 yum_gpg_DATA += gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
yum_gpg_DATA += gpg/gpg-pubkey-eac29b6f-3fe1f458 yum_gpg_DATA += gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
apt_gpgdir = $(sysconfdir)/apt/gpg apt_gpgdir = $(sysconfdir)/apt/gpg
apt_gpg_DATA = apt_gpg_DATA =
apt_gpg_DATA += gpg/gpg-pubkey-69ce4a83-44cc2b30 apt_gpg_DATA += gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
apt_gpg_DATA += gpg/gpg-pubkey-eac29b6f-3fe1f458 apt_gpg_DATA += gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
EXTRA_DIST += $(srcdir)/gpg/gpg-pubkey*
noinst_HEADERS = rtems-@RTEMS_API@-repo-conf.spec noinst_HEADERS = rtems-@RTEMS_API@-repo-conf.spec
rtems-@RTEMS_API@-repo-conf.spec: rtems-repo-conf.spec.in configure.ac rtems-@RTEMS_API@-repo-conf.spec: rtems-repo-conf.spec.in configure.ac

View File

@@ -5,8 +5,8 @@ mirrorlist=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@/@YUM
# metadata_expire=0 # metadata_expire=0
enabled=1 enabled=1
gpgcheck=1 gpgcheck=1
gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30 gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458 file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
[rtems-@RTEMS_API@-source] [rtems-@RTEMS_API@-source]
name=RTEMS-@RTEMS_API@ for @OS_NAME@ @YUM_VERDIR@ - $basearch - source name=RTEMS-@RTEMS_API@ for @OS_NAME@ @YUM_VERDIR@ - $basearch - source
@@ -15,8 +15,8 @@ mirrorlist=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@/@YUM
# metadata_expire=0 # metadata_expire=0
enabled=0 enabled=0
gpgcheck=1 gpgcheck=1
gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30 gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458 file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
[rtems-@RTEMS_API@-debuginfo] [rtems-@RTEMS_API@-debuginfo]
name=RTEMS-@RTEMS_API@ for @OS_NAME@ @YUM_VERDIR@ - $basearch - debuginfo name=RTEMS-@RTEMS_API@ for @OS_NAME@ @YUM_VERDIR@ - $basearch - debuginfo
@@ -25,5 +25,5 @@ mirrorlist=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@/@YUM
# metadata_expire=0 # metadata_expire=0
enabled=0 enabled=0
gpgcheck=1 gpgcheck=1
gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30 gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458 file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@