diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-04-30 03:47:59 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2009-04-30 03:47:59 +0000 |
| commit | 16bde857e15144856fc1ea6b97e0dbe80dbdf550 (patch) | |
| tree | 7e507a096754b8336bd6d57176a1edfc596d0f25 /contrib | |
| parent | Add OS_VERS. (diff) | |
| download | rtems-16bde857e15144856fc1ea6b97e0dbe80dbdf550.tar.bz2 | |
Use versioned gpg keys to work around Fedora 11's rpms having broken backward compatibility on checksums.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/repo-conf/Makefile.am | 30 | ||||
| -rw-r--r-- | contrib/repo-conf/yum.repos.d/rtems.repo.in | 12 |
2 files changed, 30 insertions, 12 deletions
diff --git a/contrib/repo-conf/Makefile.am b/contrib/repo-conf/Makefile.am index 30fc819c9d..6fed23d971 100644 --- a/contrib/repo-conf/Makefile.am +++ b/contrib/repo-conf/Makefile.am @@ -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,[@]OS_SUBDIR[@],@OS_SUBDIR@,' \ -e 's,[@]OS_NAME[@],@OS_NAME@,' \ + -e 's,[@]OS_VERS[@],@OS_VERS@,' \ -e 's,[@]YUM_VERDIR[@],@YUM_VERDIR@,' \ < $(srcdir)/yum.repos.d/rtems.repo.in \ > yum.repos.d/rtems-@RTEMS_API@.repo CLEANFILES += yum.repos.d/rtems-@RTEMS_API@.repo 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_gpg_DATA = -yum_gpg_DATA += gpg/gpg-pubkey-69ce4a83-44cc2b30 -yum_gpg_DATA += gpg/gpg-pubkey-eac29b6f-3fe1f458 +yum_gpg_DATA += gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@ +yum_gpg_DATA += gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@ apt_gpgdir = $(sysconfdir)/apt/gpg apt_gpg_DATA = -apt_gpg_DATA += gpg/gpg-pubkey-69ce4a83-44cc2b30 -apt_gpg_DATA += gpg/gpg-pubkey-eac29b6f-3fe1f458 - -EXTRA_DIST += $(srcdir)/gpg/gpg-pubkey* +apt_gpg_DATA += gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@ +apt_gpg_DATA += gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@ noinst_HEADERS = rtems-@RTEMS_API@-repo-conf.spec rtems-@RTEMS_API@-repo-conf.spec: rtems-repo-conf.spec.in configure.ac diff --git a/contrib/repo-conf/yum.repos.d/rtems.repo.in b/contrib/repo-conf/yum.repos.d/rtems.repo.in index 0e22c4eb27..414b370b08 100644 --- a/contrib/repo-conf/yum.repos.d/rtems.repo.in +++ b/contrib/repo-conf/yum.repos.d/rtems.repo.in @@ -5,8 +5,8 @@ mirrorlist=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@/@YUM # metadata_expire=0 enabled=1 gpgcheck=1 -gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30 - file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458 +gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@ + file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@ [rtems-@RTEMS_API@-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 enabled=0 gpgcheck=1 -gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30 - file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458 +gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@ + file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@ [rtems-@RTEMS_API@-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 enabled=0 gpgcheck=1 -gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30 - file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458 +gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@ + file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@ |