From 349ca0c56fd48cc0d36df8b8a93a0c6b6baf9dd8 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 24 Oct 2008 06:57:08 +0000 Subject: Sync with HEAD. --- contrib/repo-conf/ChangeLog | 4 ++++ contrib/repo-conf/Makefile.am | 2 ++ contrib/repo-conf/apt/sources.list.d/rtems.list.in | 11 ----------- contrib/repo-conf/configure.ac | 13 ++++++++++++- contrib/repo-conf/yum.repos.d/rtems.repo.in | 8 ++++---- 5 files changed, 22 insertions(+), 16 deletions(-) (limited to 'contrib/repo-conf') diff --git a/contrib/repo-conf/ChangeLog b/contrib/repo-conf/ChangeLog index 4a5b6bdcc0..999d982040 100644 --- a/contrib/repo-conf/ChangeLog +++ b/contrib/repo-conf/ChangeLog @@ -1,3 +1,7 @@ +2008-10-01 Joel Sherrill + + * aclocal/version.m4: Bump API to 4.10. + 2007-02-18 Ralf Corsépius * configure.ac: Bump version to 0.5. diff --git a/contrib/repo-conf/Makefile.am b/contrib/repo-conf/Makefile.am index a24476f414..8e4b7b6d58 100644 --- a/contrib/repo-conf/Makefile.am +++ b/contrib/repo-conf/Makefile.am @@ -11,6 +11,7 @@ apt/sources.list.d/rtems-@RTEMS_API@.list: apt/sources.list.d/rtems.list.in @$(mkdir_p) apt/sources.list.d 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 CLEANFILES += apt/sources.list.d/rtems-@RTEMS_API@.list @@ -26,6 +27,7 @@ yum.repos.d/rtems-@RTEMS_API@.repo: yum.repos.d/rtems.repo.in sed -e 's,[@]sysconfdir[@],$(sysconfdir),' \ -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 CLEANFILES += yum.repos.d/rtems-@RTEMS_API@.repo diff --git a/contrib/repo-conf/apt/sources.list.d/rtems.list.in b/contrib/repo-conf/apt/sources.list.d/rtems.list.in index 114da93e0b..b214c4ea5f 100644 --- a/contrib/repo-conf/apt/sources.list.d/rtems.list.in +++ b/contrib/repo-conf/apt/sources.list.d/rtems.list.in @@ -8,14 +8,3 @@ repomd ftp://ftp.rtems.org/pub/rtems/linux/@RTEMS_API@ @OS_SUBDIR@$(VERSION)/$(A ## 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 diff --git a/contrib/repo-conf/configure.ac b/contrib/repo-conf/configure.ac index 45633ac350..eec0e47cd4 100644 --- a/contrib/repo-conf/configure.ac +++ b/contrib/repo-conf/configure.ac @@ -2,17 +2,28 @@ # Process this file with autoconf to produce a configure script. 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 AC_CONFIG_SRCDIR([gpg]) AC_CONFIG_AUX_DIR([.]) 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= ... os subdirectory]), [os_subdir="$enable_os_subdir"], [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 diff --git a/contrib/repo-conf/yum.repos.d/rtems.repo.in b/contrib/repo-conf/yum.repos.d/rtems.repo.in index 06d437f8aa..fc2f8ee408 100644 --- a/contrib/repo-conf/yum.repos.d/rtems.repo.in +++ b/contrib/repo-conf/yum.repos.d/rtems.repo.in @@ -1,5 +1,5 @@ [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 http://www.rtems.info/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@$releasever/$basearch @@ -10,7 +10,7 @@ gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30 file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-eac29b6f-3fe1f458 [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 http://www.rtems.info/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@$releasever/SRPMS @@ -20,8 +20,8 @@ gpgcheck=1 gpgkey=file://@sysconfdir@/pki/rpm-gpg/gpg-pubkey-69ce4a83-44cc2b30 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 http://www.rtems.info/ftp/pub/rtems/linux/@RTEMS_API@/@OS_SUBDIR@$releasever/$basearch/debug -- cgit v1.2.3