Changeset 6e813710 in rtems

Timestamp:

09/23/09 03:29:15 (14 years ago)

Author:

Ralf Corsepius <ralf.corsepius@…>

Branches:

4.9

Children:

209fadea

Parents:

62af225

Message:

Sync with rtems-4.10.

Location:

contrib/repo-conf

Files:

• .cvsignore (modified) (1 diff)
• Makefile.am (modified) (3 diffs)
• configure.ac (modified) (1 diff)

contrib/repo-conf/.cvsignore

@@ -10 +10 @@
 *.spec
 *.tar.bz2
+*.tar.xz

contrib/repo-conf/Makefile.am

@@ -39 +39 @@
 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 \
+        cat $(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@
@@ -49 +47 @@
 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 \
+        cat $(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@
@@ -67 +63 @@
 
 noinst_HEADERS = rtems-@RTEMS_API@-repo-conf.spec
-rtems-@RTEMS_API@-repo-conf.spec: rtems-repo-conf.spec.in configure.ac
+rtems-@RTEMS_API@-repo-conf.spec: rtems-repo-conf.spec.in config.status
         ./config.status --file=rtems-@RTEMS_API@-repo-conf.spec:rtems-repo-conf.spec.in
 EXTRA_DIST += rtems-repo-conf.spec.in

contrib/repo-conf/configure.ac

@@ -32 +32 @@
   apt_verdir="5"
   ;;
-suse-* )
+suse-*)
   os_name="openSUSE"
   os_subdir="suse"