Changeset e1be2b3 in rtems


Ignore:
Timestamp:
Apr 30, 2009, 4:38:01 PM (10 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.

Location:
contrib/repo-conf
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • contrib/repo-conf/Makefile.am

    r72c7d3e re1be2b3  
    3030          -e 's,[@]OS_SUBDIR[@],@OS_SUBDIR@,' \
    3131          -e 's,[@]OS_NAME[@],@OS_NAME@,' \
     32          -e 's,[@]OS_VERS[@],@OS_VERS@,' \
    3233          -e 's,[@]YUM_VERDIR[@],@YUM_VERDIR@,' \
    3334          < $(srcdir)/yum.repos.d/rtems.repo.in \
     
    3637EXTRA_DIST += $(srcdir)/yum.repos.d/*repo.in
    3738
     39gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@: gpg/gpg-pubkey-69ce4a83-44cc2b30
     40        @$(mkdir_p) gpg
     41        sed -e 's,[@]OS_SUBDIR[@],@OS_SUBDIR@,' \
     42          -e 's,[@]OS_VERS[@],@OS_VERS@,' \
     43          < $(srcdir)/gpg/gpg-pubkey-69ce4a83-44cc2b30 \
     44          > gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
     45CLEANFILES += gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
     46EXTRA_DIST += $(srcdir)/gpg/gpg-pubkey-69ce4a83-44cc2b30
     47
     48
     49gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@: gpg/gpg-pubkey-eac29b6f-3fe1f458
     50        @$(mkdir_p) gpg
     51        sed -e 's,[@]OS_SUBDIR[@],@OS_SUBDIR@,' \
     52          -e 's,[@]OS_VERS[@],@OS_VERS@,' \
     53          < $(srcdir)/gpg/gpg-pubkey-eac29b6f-3fe1f458 \
     54          > gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
     55CLEANFILES += gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
     56EXTRA_DIST += $(srcdir)/gpg/gpg-pubkey-eac29b6f-3fe1f458
     57
    3858yum_gpgdir = $(sysconfdir)/pki/rpm-gpg
    3959yum_gpg_DATA =
    40 yum_gpg_DATA += gpg/gpg-pubkey-69ce4a83-44cc2b30
    41 yum_gpg_DATA += gpg/gpg-pubkey-eac29b6f-3fe1f458
     60yum_gpg_DATA += gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
     61yum_gpg_DATA += gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
    4262
    4363apt_gpgdir = $(sysconfdir)/apt/gpg
    4464apt_gpg_DATA =
    45 apt_gpg_DATA += gpg/gpg-pubkey-69ce4a83-44cc2b30
    46 apt_gpg_DATA += gpg/gpg-pubkey-eac29b6f-3fe1f458
    47 
    48 EXTRA_DIST += $(srcdir)/gpg/gpg-pubkey*
     65apt_gpg_DATA += gpg/gpg-pubkey-69ce4a83-44cc2b30-@OS_SUBDIR@-@OS_VERS@
     66apt_gpg_DATA += gpg/gpg-pubkey-eac29b6f-3fe1f458-@OS_SUBDIR@-@OS_VERS@
    4967
    5068noinst_HEADERS = rtems-@RTEMS_API@-repo-conf.spec
  • contrib/repo-conf/apt/sources.list.d/rtems.list.in

    r72c7d3e re1be2b3  
    22## http://apt-rpm.laiskiainen.org/
    33
    4 repomd ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@ @OS_SUBDIR@@APT_VERDIR@/$(ARCH)
     4repomd ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@ @OS_SUBDIR@/@APT_VERDIR@/$(ARCH)
    55
    66## uncomment the line below if you want to access the *.src.rpms
    7 # repomd-src ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@ @OS_SUBDIR@@APT_VERDIR@/SRPMS
     7# repomd-src ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@ @OS_SUBDIR@/@APT_VERDIR@/SRPMS
    88
    99## uncomment the line below if you want to access the *-debuginfo*.rpms
    10 # repomd-debug ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@ @OS_SUBDIR@@APT_VERDIR@/$(ARCH)/debug
     10# repomd-debug ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@ @OS_SUBDIR@/@APT_VERDIR@/$(ARCH)/debug
  • contrib/repo-conf/configure.ac

    r72c7d3e re1be2b3  
    33
    44AC_PREREQ(2.61)
    5 AC_INIT([rtems-]_RTEMS_API[-repo-conf],[0.15],[http://www.rtems.org/bugzilla],
     5AC_INIT([rtems-]_RTEMS_API[-repo-conf],[0.16],[http://www.rtems.org/bugzilla],
    66  [rtems-]_RTEMS_API[-repo-conf])
    77RTEMS_VERSIONING
     
    2020fedora-9* | fedora-10* | fedora-11* )
    2121  os_name="Fedora"
    22   os_subdir="fedora/"
     22  os_subdir="fedora"
     23  os_vers=`echo $osname| sed -e 's,^.*-,,'`
    2324  yum_verdir="\$\$releasever"
    2425  apt_verdir="\$\$(VERSION)"
     
    2627centos-5* | redhat-el5* | fedora-7* | fedora-8* )
    2728  os_name="CentOS"
    28   os_subdir="centos/"
     29  os_subdir="centos"
     30  os_vers=`echo $osname| sed -e 's,^.*-,,'`
    2931  yum_verdir="5"
    3032  apt_verdir="5"
     
    3234centos-4* | redhat-el4* | fedora-5* | fedora-6* )
    3335  os_name="CentOS"
    34   os_subdir="centos/"
     36  os_subdir="centos"
     37  os_vers=`echo $osname| sed -e 's,^.*-,,'`
    3538  yum_verdir="4"
    3639  apt_verdir="4"
     
    3841suse-*)
    3942  os_name="openSUSE"
    40   os_subdir="suse/"
     43  os_subdir="suse"
     44  os_vers=`echo $osname| sed -e 's,^.*-,,'`
    4145  yum_verdir="\$\$releasever"
    4246  apt_verdir="\$\$(VERSION)"
     
    4650esac
    4751
     52AC_SUBST([OS_NAME],[$os_name])
    4853AC_SUBST([OS_SUBDIR],[$os_subdir])
     54AC_SUBST([OS_VERS],[$os_vers])
    4955AC_SUBST([YUM_VERDIR],[$yum_verdir])
    5056AC_SUBST([APT_VERDIR],[$apt_verdir])
    51 AC_SUBST([OS_NAME],[$os_name])
    5257
    5358AC_CONFIG_FILES([Makefile])
  • 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.