Ignore:
Timestamp:
Apr 30, 2009, 4:38:01 PM (12 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.8
Children:
d7196bf
Parents:
72c7d3e
Message:

Merge changes from CVS-HEAD addressing Fedora 11 rpm regressions.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • contrib/repo-conf/yum.repos.d/rtems.repo.in

    r72c7d3e re1be2b3  
    11[rtems-@RTEMS_API@]
    22name=RTEMS-@RTEMS_API@ for @OS_NAME@ @YUM_VERDIR@ - $basearch
    3 # baseurl=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@@YUM_VERDIR@/$basearch
    4 mirrorlist=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@@YUM_VERDIR@/mirrorlist
     3# baseurl=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@/@YUM_VERDIR@/$basearch
     4mirrorlist=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@/@YUM_VERDIR@/mirrorlist
    55# metadata_expire=0
    66enabled=1
    77gpgcheck=1
    8 gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30
    9         file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458
     8gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
     9        file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
    1010
    1111[rtems-@RTEMS_API@-source]
    1212name=RTEMS-@RTEMS_API@ for @OS_NAME@ @YUM_VERDIR@ - $basearch - source
    13 # baseurl=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@@YUM_VERDIR@/SRPMS
    14 mirrorlist=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@@YUM_VERDIR@/mirrorlist-sources
     13# baseurl=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@/@YUM_VERDIR@/SRPMS
     14mirrorlist=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@/@YUM_VERDIR@/mirrorlist-source
    1515# metadata_expire=0
    1616enabled=0
    1717gpgcheck=1
    18 gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30
    19         file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458
     18gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
     19        file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
    2020
    2121[rtems-@RTEMS_API@-debuginfo]
    2222name=RTEMS-@RTEMS_API@ for @OS_NAME@ @YUM_VERDIR@ - $basearch - debuginfo
    23 # baseurl=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@@YUM_VERDIR@/$basearch/debug
    24 mirrorlist=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@@YUM_VERDIR@/mirrorlist-debuginfo
     23# baseurl=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@/@YUM_VERDIR@/$basearch/debug
     24mirrorlist=http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@/@YUM_VERDIR@/mirrorlist-debuginfo
    2525# metadata_expire=0
    2626enabled=0
    2727gpgcheck=1
    28 gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30
    29         file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458
     28gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
     29        file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
Note: See TracChangeset for help on using the changeset viewer.