Changeset c3a99269 in rtems

Timestamp:

Oct 24, 2008, 1:48:31 PM (12 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.8

Children:

b37ab14

Parents:

d6b8d5c

Message:

Sync with CVS-HEAD.

Location:

contrib/repo-conf

Files:

• ChangeLog (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• apt/sources.list.d/rtems.list.in (modified) (1 diff)
• configure.ac (modified) (3 diffs)
• yum.repos.d/rtems.repo.in (modified) (3 diffs)

contrib/repo-conf/ChangeLog

@@ +1 @@
+2008-10-01      Joel Sherrill <joel.sherrill@oarcorp.com>
+
+        * aclocal/version.m4: Bump API to 4.10.
+
 2007-02-18      Ralf Corsépius <ralf.corsepius@rtems.org>
 

contrib/repo-conf/Makefile.am

@@ -12 +12 @@
         sed -e 's,[@]RTEMS_API[@],@RTEMS_API@,' \
           -e 's,[@]OS_SUBDIR[@],@OS_SUBDIR@,' \
+          -e 's,[@]OS_NAME[@],@OS_NAME@,' \
           < $(srcdir)/apt/sources.list.d/rtems.list.in \
           > apt/sources.list.d/rtems-@RTEMS_API@.list
@@ -27 +28 @@
           -e 's,[@]RTEMS_API[@],@RTEMS_API@,' \
           -e 's,[@]OS_SUBDIR[@],@OS_SUBDIR@,' \
+          -e 's,[@]OS_NAME[@],@OS_NAME@,' \
           < $(srcdir)/yum.repos.d/rtems.repo.in \
           > yum.repos.d/rtems-@RTEMS_API@.repo

contrib/repo-conf/apt/sources.list.d/rtems.list.in

@@ -9 +9 @@
 ## uncomment the line below if you want to access the *-debuginfo*.rpms
 # repomd-debug ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@ @OS_SUBDIR@$(VERSION)/$(ARCH)/debug
-
-
-## rtems/testing repos
-
-# repomd ftp://ftp.rtems.org/pub/rtems/linux/testing/@RTEMS_API@ @OS_SUBDIR@$(VERSION)/$(ARCH)
-
-## uncomment the line below if you want to access the *.src.rpms
-# repomd-src ftp://ftp.rtems.org/pub/rtems/linux/testing/@RTEMS_API@ @OS_SUBDIR@$(VERSION)/SRPMS
-
-## uncomment the line below if you want to access the *-debuginfo*.rpms
-# repomd-debug ftp://ftp.rtems.org/pub/rtems/linux/testing/@RTEMS_API@ @OS_SUBDIR@$(VERSION)/$(ARCH)/debug

contrib/repo-conf/configure.ac

@@ -3 +3 @@
 
 AC_PREREQ(2.61)
-AC_INIT([rtems-]_RTEMS_API[-repo-conf],[0.10],[http://www.rtems.org/bugzilla],
+AC_INIT([rtems-]_RTEMS_API[-repo-conf],[0.12],[http://www.rtems.org/bugzilla],
   [rtems-]_RTEMS_API[-repo-conf])
 RTEMS_VERSIONING
@@ -10 +10 @@
 AC_SUBST([RTEMS_API],[_RTEMS_API])
 AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip 1.10])
+
 AC_ARG_ENABLE(os_subdir,AS_HELP_STRING(
 [--enable-os-subdir=<dir> ... os subdirectory]),
@@ -15 +16 @@
 [os_subdir="fedora/"])
 AC_SUBST([OS_SUBDIR],[$os_subdir])
+
+case "$os_subdir" in
+fedora/ ) os_name="Fedora";;
+redhat/el ) os_name="CentOS";;
+suse/ ) os_name="openSUSE";;
+*) AC_MSG_ERROR([Invalid os-name])
+  ;;
+esac
+AC_SUBST([OS_NAME],[$os_name])
+
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

contrib/repo-conf/yum.repos.d/rtems.repo.in

@@ -1 +1 @@
 [rtems-@RTEMS_API@]
-name=RTEMS $releasever - $basearch - RTEMS
+name=RTEMS-@RTEMS_API@ for @OS_NAME@ $releasever - $basearch
 baseurl=
         http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@$releasever/$basearch
@@ -11 +11 @@
 
 [rtems-@RTEMS_API@-source]
-name=Fedora $releasever - $basearch - RTEMS sources
+name=RTEMS-@RTEMS_API@ for @OS_NAME@ $releasever - $basearch - source
 baseurl=
         http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@$releasever/SRPMS
@@ -21 +21 @@
         file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458
 
-[rtems-@RTEMS_API@-debug]
-name=Fedora $releasever - $basearch - RTEMS sources
+[rtems-@RTEMS_API@-debuginfo]
+name=RTEMS-@RTEMS_API@ for @OS_NAME@ $releasever - $basearch - debuginfo
 baseurl=
         http://www.rtems.org/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@$releasever/$basearch/debug