[rtems-buildsys commit] Abandon mingw32-i686-rtems4.11 (

Ralf Corsepius ralf at rtems.org
Thu Feb 14 22:25:41 UTC 2013 

 Replaced by mingw64-i686-rtems4.11).
User-Agent: Heirloom mailx 12.4 7/29/08
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 8bit

Module:    rtems-buildsys
Branch:    master
Commit:    dcff1f8b5fc33a8ab5a1b9df82e80de599cd0162
Changeset: http://git.rtems.org/rtems-buildsys/commit/?id=dcff1f8b5fc33a8ab5a1b9df82e80de599cd0162

Author:    Ralf Corsépius <ralf.corsepius at rtems.org>
Date:      Tue Feb 12 16:52:12 2013 +0100

Abandon mingw32-i686-rtems4.11 (Replaced by mingw64-i686-rtems4.11).

---

 rtems-mock/Makefile.in                            |   12 ------
 rtems-mock/configure                              |   20 +++++-----
 rtems-mock/configure.ac                           |    2 +-
 rtems-mock/etc/mock/makefile.am                   |   10 -----
 rtems-mock/etc/mock/mingw32-i686-rtems4.11.cfg.in |   42 ---------------------
 rtems-mock/make/GNUmakefile.in                    |    1 -
 rtems-mock/make/genmk                             |    1 -
 rtems-mock/make/makefile.am                       |    4 --
 rtems-mock/make/mingw32/4.11/.rpms/SRPMS/make.mk  |   28 --------------
 rtems-mock/make/mingw32/4.11/.rpms/i686/make.mk   |   28 --------------
 rtems-mock/make/mingw32/4.11/.rpms/make.mk        |    2 -
 rtems-mock/perl/RTEMS/Mock/Config.pm              |    8 ----
 12 files changed, 11 insertions(+), 147 deletions(-)

diff --git a/rtems-mock/Makefile.in b/rtems-mock/Makefile.in
index 3954339..6515113 100644
--- a/rtems-mock/Makefile.in
+++ b/rtems-mock/Makefile.in
@@ -262,7 +262,6 @@ CLEANFILES = bin/rtems-preprpms bin/rtems-drpmsclean \
 	etc/mock/fedora-18-x86_64-rtems4.11.cfg \
 	etc/mock/fedora-18-x86_64-rtems-infra.cfg \
 	etc/mock/mingw32-i686-rtems4.10.cfg \
-	etc/mock/mingw32-i686-rtems4.11.cfg \
 	etc/mock/mingw32-i686-rtems4.8.cfg \
 	etc/mock/mingw32-i686-rtems4.9.cfg \
 	etc/mock/mingw64-i686-rtems4.11.cfg \
@@ -323,7 +322,6 @@ EXTRA_DIST = bin/rtems-preprpms.in bin/rtems-drpmsclean.in \
 	etc/mock/fedora-18-x86_64-rtems4.11.cfg.in \
 	etc/mock/fedora-18-x86_64-rtems-infra.cfg.in \
 	etc/mock/mingw32-i686-rtems4.10.cfg.in \
-	etc/mock/mingw32-i686-rtems4.11.cfg.in \
 	etc/mock/mingw32-i686-rtems4.8.cfg.in \
 	etc/mock/mingw32-i686-rtems4.9.cfg.in \
 	etc/mock/mingw64-i686-rtems4.11.cfg.in \
@@ -430,7 +428,6 @@ mockcfg_DATA = etc/mock/centos-5-i386-rtems4.10.cfg \
 	etc/mock/fedora-18-x86_64-rtems4.11.cfg \
 	etc/mock/fedora-18-x86_64-rtems-infra.cfg \
 	etc/mock/mingw32-i686-rtems4.10.cfg \
-	etc/mock/mingw32-i686-rtems4.11.cfg \
 	etc/mock/mingw32-i686-rtems4.8.cfg \
 	etc/mock/mingw32-i686-rtems4.9.cfg \
 	etc/mock/mingw64-i686-rtems4.11.cfg \
@@ -557,9 +554,6 @@ nobase_make_HEADERS = make/GNUmakefile \
 	make/mingw32/4.10/.rpms/make.mk \
 	make/mingw32/4.10/.rpms/i686/make.mk \
 	make/mingw32/4.10/.rpms/SRPMS/make.mk \
-	make/mingw32/4.11/.rpms/make.mk \
-	make/mingw32/4.11/.rpms/i686/make.mk \
-	make/mingw32/4.11/.rpms/SRPMS/make.mk \
 	make/mingw32/4.8/.rpms/make.mk \
 	make/mingw32/4.8/.rpms/i686/make.mk \
 	make/mingw32/4.8/.rpms/SRPMS/make.mk \
@@ -1631,12 +1625,6 @@ etc/mock/mingw32-i686-rtems4.10.cfg: etc/mock/mingw32-i686-rtems4.10.cfg.in etc/
 	< $(srcdir)/etc/mock/mingw32-i686-rtems4.10.cfg.in \
 	> etc/mock/mingw32-i686-rtems4.10.cfg
 
-etc/mock/mingw32-i686-rtems4.11.cfg: etc/mock/mingw32-i686-rtems4.11.cfg.in etc/mock/$(dirstamp)
-	sed \
-	  -e 's,[@]buildgroupsdir[@],file://$(mockdatadir)/buildgroups,' \
-	< $(srcdir)/etc/mock/mingw32-i686-rtems4.11.cfg.in \
-	> etc/mock/mingw32-i686-rtems4.11.cfg
-
 etc/mock/mingw32-i686-rtems4.8.cfg: etc/mock/mingw32-i686-rtems4.8.cfg.in etc/mock/$(dirstamp)
 	sed \
 	  -e 's,[@]buildgroupsdir[@],file://$(mockdatadir)/buildgroups,' \
diff --git a/rtems-mock/configure b/rtems-mock/configure
index 3a9a00f..193a201 100755
--- a/rtems-mock/configure
+++ b/rtems-mock/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for rtems-mock 1.20130211.0.
+# Generated by GNU Autoconf 2.69 for rtems-mock 1.20130212.0.
 #
 # Report bugs to <ralf.corsepius at rtems.org>.
 #
@@ -579,8 +579,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='rtems-mock'
 PACKAGE_TARNAME='rtems-mock'
-PACKAGE_VERSION='1.20130211.0'
-PACKAGE_STRING='rtems-mock 1.20130211.0'
+PACKAGE_VERSION='1.20130212.0'
+PACKAGE_STRING='rtems-mock 1.20130212.0'
 PACKAGE_BUGREPORT='ralf.corsepius at rtems.org'
 PACKAGE_URL=''
 
@@ -1213,7 +1213,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures rtems-mock 1.20130211.0 to adapt to many kinds of systems.
+\`configure' configures rtems-mock 1.20130212.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1279,7 +1279,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of rtems-mock 1.20130211.0:";;
+     short | recursive ) echo "Configuration of rtems-mock 1.20130212.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1358,7 +1358,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-rtems-mock configure 1.20130211.0
+rtems-mock configure 1.20130212.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1375,7 +1375,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by rtems-mock $as_me 1.20130211.0, which was
+It was created by rtems-mock $as_me 1.20130212.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2199,7 +2199,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='rtems-mock'
- VERSION='1.20130211.0'
+ VERSION='1.20130212.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3256,7 +3256,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by rtems-mock $as_me 1.20130211.0, which was
+This file was extended by rtems-mock $as_me 1.20130212.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3309,7 +3309,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-rtems-mock config.status 1.20130211.0
+rtems-mock config.status 1.20130212.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/rtems-mock/configure.ac b/rtems-mock/configure.ac
index a5e32ed..e970ed3 100644
--- a/rtems-mock/configure.ac
+++ b/rtems-mock/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.69)
-AC_INIT([rtems-mock],[1.20130211.0],[ralf.corsepius at rtems.org],[rtems-mock])
+AC_INIT([rtems-mock],[1.20130212.0],[ralf.corsepius at rtems.org],[rtems-mock])
 AM_INIT_AUTOMAKE([no-dist-gzip dist-xz tar-pax 1.12.6 foreign])
 AM_MAINTAINER_MODE
 
diff --git a/rtems-mock/etc/mock/makefile.am b/rtems-mock/etc/mock/makefile.am
index 40ee30f..1f5aa37 100644
--- a/rtems-mock/etc/mock/makefile.am
+++ b/rtems-mock/etc/mock/makefile.am
@@ -357,16 +357,6 @@ etc/mock/mingw32-i686-rtems4.10.cfg: etc/mock/mingw32-i686-rtems4.10.cfg.in etc/
 EXTRA_DIST += etc/mock/mingw32-i686-rtems4.10.cfg.in
 CLEANFILES += etc/mock/mingw32-i686-rtems4.10.cfg
 
-mockcfg_DATA += etc/mock/mingw32-i686-rtems4.11.cfg
-
-etc/mock/mingw32-i686-rtems4.11.cfg: etc/mock/mingw32-i686-rtems4.11.cfg.in etc/mock/$(dirstamp)
-	sed \
-	  -e 's,[@]buildgroupsdir[@],file://$(mockdatadir)/buildgroups,' \
-	< $(srcdir)/etc/mock/mingw32-i686-rtems4.11.cfg.in \
-	> etc/mock/mingw32-i686-rtems4.11.cfg
-EXTRA_DIST += etc/mock/mingw32-i686-rtems4.11.cfg.in
-CLEANFILES += etc/mock/mingw32-i686-rtems4.11.cfg
-
 mockcfg_DATA += etc/mock/mingw32-i686-rtems4.8.cfg
 
 etc/mock/mingw32-i686-rtems4.8.cfg: etc/mock/mingw32-i686-rtems4.8.cfg.in etc/mock/$(dirstamp)
diff --git a/rtems-mock/etc/mock/mingw32-i686-rtems4.11.cfg.in b/rtems-mock/etc/mock/mingw32-i686-rtems4.11.cfg.in
deleted file mode 100644
index 3eba068..0000000
--- a/rtems-mock/etc/mock/mingw32-i686-rtems4.11.cfg.in
+++ /dev/null
@@ -1,42 +0,0 @@
-config_opts['root'] = 'mingw32-i686-rtems'
-config_opts['target_arch'] = 'i386'
-config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
-config_opts['macros']['%vendor'] = 'RTEMS Project http://www.rtems.org'
-config_opts['macros']['%_with_noarch_subpackages'] = '1'
-
-config_opts['macros']['%dist'] = '.mgw'
-config_opts['macros']['%mingw32'] = '1'
-config_opts['macros']['%_host'] = 'i686-pc-mingw32'
-config_opts['macros']['%_build'] = 'i386-pc-linux-gnu'
-config_opts['rpmbuild_arch'] = 'i686-pc-mingw32'
-
-config_opts['yum.conf'] = """
-[main]
-cachedir=/var/cache/yum
-debuglevel=1
-reposdir=/dev/null
-logfile=/var/log/yum.log
-retries=20
-obsoletes=1
-gpgcheck=0
-assumeyes=1
-
-# repos
-[fedora]
-name=fedora
-# baseurl=ftp://download.fedoraproject.org/pub/fedora/linux/releases/16/Everything/i386/os/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-16&arch=i386
-
-[updates]
-name=updates
-# baseurl=ftp://download.fedoraproject.org/pub/fedora/linux/updates/16/i386/
-mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f16&arch=i386
-
-[rtems-infra]
-name=infrastructure
-baseurl=ftp://ftp.rtems.org/pub/rtems/linux/infrastructure/fedora/16/i386/
-
-[rtems-4.11]
-name=rtems-4.11
-baseurl=ftp://ftp.rtems.org/pub/rtems/linux/4.11/fedora/16/i386/
-"""
diff --git a/rtems-mock/make/GNUmakefile.in b/rtems-mock/make/GNUmakefile.in
index c78a1a5..87dad8e 100644
--- a/rtems-mock/make/GNUmakefile.in
+++ b/rtems-mock/make/GNUmakefile.in
@@ -33,7 +33,6 @@ include make/cygwin/4.11/.rpms/make.mk
 include make/cygwin/4.8/.rpms/make.mk
 include make/cygwin/4.9/.rpms/make.mk
 include make/mingw32/4.10/.rpms/make.mk
-include make/mingw32/4.11/.rpms/make.mk
 include make/mingw32/4.8/.rpms/make.mk
 include make/mingw32/4.9/.rpms/make.mk
 include make/mingw64/4.11/.rpms/make.mk
diff --git a/rtems-mock/make/genmk b/rtems-mock/make/genmk
index 0630b75..aef1f28 100755
--- a/rtems-mock/make/genmk
+++ b/rtems-mock/make/genmk
@@ -25,7 +25,6 @@ for f in \
   linux/4.9/centos/5/SRPMS linux/4.9/centos/5/i386 linux/4.9/centos/5/x86_64 \
   linux/4.8/centos/5/SRPMS linux/4.8/centos/5/i386 linux/4.8/centos/5/x86_64 \
   mingw64/4.11/.rpms/SRPMS mingw64/4.11/.rpms/i686 mingw64/4.11/.rpms/x86_64 \
-  mingw32/4.11/.rpms/SRPMS mingw32/4.11/.rpms/i686 \
   mingw32/4.10/.rpms/SRPMS mingw32/4.10/.rpms/i686 \
   mingw32/4.9/.rpms/SRPMS mingw32/4.9/.rpms/i686 \
   mingw32/4.8/.rpms/SRPMS mingw32/4.8/.rpms/i686 \
diff --git a/rtems-mock/make/makefile.am b/rtems-mock/make/makefile.am
index 784d1be..0f8fe6b 100644
--- a/rtems-mock/make/makefile.am
+++ b/rtems-mock/make/makefile.am
@@ -124,10 +124,6 @@ nobase_make_HEADERS += make/mingw32/4.10/.rpms/make.mk
 nobase_make_HEADERS += make/mingw32/4.10/.rpms/i686/make.mk
 nobase_make_HEADERS += make/mingw32/4.10/.rpms/SRPMS/make.mk
 
-nobase_make_HEADERS += make/mingw32/4.11/.rpms/make.mk
-nobase_make_HEADERS += make/mingw32/4.11/.rpms/i686/make.mk
-nobase_make_HEADERS += make/mingw32/4.11/.rpms/SRPMS/make.mk
-
 nobase_make_HEADERS += make/mingw32/4.8/.rpms/make.mk
 nobase_make_HEADERS += make/mingw32/4.8/.rpms/i686/make.mk
 nobase_make_HEADERS += make/mingw32/4.8/.rpms/SRPMS/make.mk
diff --git a/rtems-mock/make/mingw32/4.11/.rpms/SRPMS/make.mk b/rtems-mock/make/mingw32/4.11/.rpms/SRPMS/make.mk
deleted file mode 100644
index 7055ea0..0000000
--- a/rtems-mock/make/mingw32/4.11/.rpms/SRPMS/make.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-$(FTPHOME)/mingw32/4.11/.rpms/SRPMS:
-	mkdir -p $(FTPHOME)/mingw32/4.11/.rpms/SRPMS
-DIRS += $(FTPHOME)/mingw32/4.11/.rpms/SRPMS
-
-$(CACHEDIR)/mingw32/4.11/.rpms/SRPMS:
-	mkdir -p $(CACHEDIR)/mingw32/4.11/.rpms/SRPMS
-DIRS += $(CACHEDIR)/mingw32/4.11/.rpms/SRPMS
-
-$(FTPHOME)/mingw32/4.11/.rpms/SRPMS/repodata/repomd.xml: $(wildcard $(FTPHOME)/mingw32/4.11/.rpms/SRPMS/*.rpm) \
-	$(CACHEDIR)/mingw32/4.11/.rpms/SRPMS
-	mkdir -p $(FTPHOME)/mingw32/4.11/.rpms/SRPMS
-	$(CREATEREPO) -c $(CACHEDIR)/mingw32/4.11/.rpms/SRPMS \
-	$(FTPHOME)/mingw32/4.11/.rpms/SRPMS
-REPOS += $(FTPHOME)/mingw32/4.11/.rpms/SRPMS/repodata/repomd.xml
-
-$(FTPHOME)/mingw32/obsolete/4.11/.rpms/SRPMS:
-	mkdir -p $(FTPHOME)/mingw32/obsolete/4.11/.rpms/SRPMS
-DIRS += $(FTPHOME)/mingw32/obsolete/4.11/.rpms/SRPMS
-
-$(FTPHOME)/mingw32/obsolete/4.11/.rpms/SRPMS/.stamp: $(wildcard $(FTPHOME)/mingw32/4.11/.rpms/SRPMS/*rpm) \
-	$(FTPHOME)/mingw32/obsolete/4.11/.rpms/SRPMS
-	@(cd $(FTPHOME)/mingw32 && $(REPOCLEAN) 4.11/.rpms/SRPMS) | \
-	while read a; do \
-	echo "Backing up: $$a"; \
-	mv $(FTPHOME)/mingw32/$$a $(FTPHOME)/mingw32/obsolete/$$a; \
-	done
-	touch $(FTPHOME)/mingw32/obsolete/4.11/.rpms/SRPMS/.stamp
-OBSSTAMPS += $(FTPHOME)/mingw32/obsolete/4.11/.rpms/SRPMS/.stamp
diff --git a/rtems-mock/make/mingw32/4.11/.rpms/i686/make.mk b/rtems-mock/make/mingw32/4.11/.rpms/i686/make.mk
deleted file mode 100644
index 02e6d16..0000000
--- a/rtems-mock/make/mingw32/4.11/.rpms/i686/make.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-$(FTPHOME)/mingw32/4.11/.rpms/i686:
-	mkdir -p $(FTPHOME)/mingw32/4.11/.rpms/i686
-DIRS += $(FTPHOME)/mingw32/4.11/.rpms/i686
-
-$(CACHEDIR)/mingw32/4.11/.rpms/i686:
-	mkdir -p $(CACHEDIR)/mingw32/4.11/.rpms/i686
-DIRS += $(CACHEDIR)/mingw32/4.11/.rpms/i686
-
-$(FTPHOME)/mingw32/4.11/.rpms/i686/repodata/repomd.xml: $(wildcard $(FTPHOME)/mingw32/4.11/.rpms/i686/*.rpm) \
-	$(CACHEDIR)/mingw32/4.11/.rpms/i686
-	mkdir -p $(FTPHOME)/mingw32/4.11/.rpms/i686
-	$(CREATEREPO) -c $(CACHEDIR)/mingw32/4.11/.rpms/i686 \
-	$(FTPHOME)/mingw32/4.11/.rpms/i686
-REPOS += $(FTPHOME)/mingw32/4.11/.rpms/i686/repodata/repomd.xml
-
-$(FTPHOME)/mingw32/obsolete/4.11/.rpms/i686:
-	mkdir -p $(FTPHOME)/mingw32/obsolete/4.11/.rpms/i686
-DIRS += $(FTPHOME)/mingw32/obsolete/4.11/.rpms/i686
-
-$(FTPHOME)/mingw32/obsolete/4.11/.rpms/i686/.stamp: $(wildcard $(FTPHOME)/mingw32/4.11/.rpms/i686/*rpm) \
-	$(FTPHOME)/mingw32/obsolete/4.11/.rpms/i686
-	@(cd $(FTPHOME)/mingw32 && $(REPOCLEAN) 4.11/.rpms/i686) | \
-	while read a; do \
-	echo "Backing up: $$a"; \
-	mv $(FTPHOME)/mingw32/$$a $(FTPHOME)/mingw32/obsolete/$$a; \
-	done
-	touch $(FTPHOME)/mingw32/obsolete/4.11/.rpms/i686/.stamp
-OBSSTAMPS += $(FTPHOME)/mingw32/obsolete/4.11/.rpms/i686/.stamp
diff --git a/rtems-mock/make/mingw32/4.11/.rpms/make.mk b/rtems-mock/make/mingw32/4.11/.rpms/make.mk
deleted file mode 100644
index 672e0c4..0000000
--- a/rtems-mock/make/mingw32/4.11/.rpms/make.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-include make/mingw32/4.11/.rpms/i686/make.mk
-include make/mingw32/4.11/.rpms/SRPMS/make.mk
diff --git a/rtems-mock/perl/RTEMS/Mock/Config.pm b/rtems-mock/perl/RTEMS/Mock/Config.pm
index 8faff2e..7635027 100644
--- a/rtems-mock/perl/RTEMS/Mock/Config.pm
+++ b/rtems-mock/perl/RTEMS/Mock/Config.pm
@@ -123,14 +123,6 @@ my @distros_4_11 = (
     suffix => ".mgw",
     archs => [ "i686", "x86_64" ],
     srpmargs => "" 
-  },
-  { id => "mingw32 1",
-    scut => "mingw32", 
-    name => "mingw32",
-    version => undef,
-    suffix => ".mgw",
-    archs => [ "i686" ],
-    srpmargs => "" 
   }
 );

More information about the vc mailing list