[rtems-buildsys commit] Add mingw-w64-i686.
Ralf Corsepius
ralf at rtems.org
Tue May 1 06:51:07 UTC 2012
Module: rtems-buildsys
Branch: master
Commit: de76ee9cc0bf87065d84c74e341e28e6dbd5211f
Changeset: http://git.rtems.org/rtems-buildsys/commit/?id=de76ee9cc0bf87065d84c74e341e28e6dbd5211f
Author: Ralf Corsépius <ralf.corsepius at rtems.org>
Date: Mon Apr 30 16:06:22 2012 +0200
Add mingw-w64-i686.
---
rtems-mock/Makefile.in | 10 +++++
rtems-mock/bin/rtems-rpm2tar.in | 9 +++-
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 | 1 +
rtems-mock/etc/mock/mingw64-i686-rtems4.11.cfg.in | 42 ++++++++++++++++++++
.../etc/mock/mingw64-x86_64-rtems4.11.cfg.in | 2 +-
rtems-mock/make/genmk | 1 +
rtems-mock/make/makefile.am | 1 +
rtems-mock/make/mingw64/4.11/.rpms/i686/make.mk | 28 +++++++++++++
rtems-mock/make/mingw64/4.11/.rpms/make.mk | 1 +
rtems-mock/perl/RTEMS/Mock/Config.pm | 2 +-
13 files changed, 114 insertions(+), 15 deletions(-)
diff --git a/rtems-mock/Makefile.in b/rtems-mock/Makefile.in
index 998de55..353124d 100644
--- a/rtems-mock/Makefile.in
+++ b/rtems-mock/Makefile.in
@@ -245,6 +245,7 @@ CLEANFILES = bin/rtems-preprpms bin/rtems-drpmsclean \
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 \
etc/mock/mingw64-x86_64-rtems4.11.cfg \
etc/mock/suse-11.4-i586-rtems4.10.cfg \
etc/mock/suse-11.4-i586-rtems4.11.cfg \
@@ -310,6 +311,7 @@ EXTRA_DIST = bin/rtems-preprpms.in bin/rtems-drpmsclean.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 \
etc/mock/mingw64-x86_64-rtems4.11.cfg.in \
etc/mock/suse-11.4-i586-rtems4.10.cfg.in \
etc/mock/suse-11.4-i586-rtems4.11.cfg.in \
@@ -421,6 +423,7 @@ mockcfg_DATA = etc/mock/centos-5-i386-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 \
etc/mock/mingw64-x86_64-rtems4.11.cfg \
etc/mock/suse-11.4-i586-rtems4.10.cfg \
etc/mock/suse-11.4-i586-rtems4.11.cfg \
@@ -565,6 +568,7 @@ nobase_make_HEADERS = make/GNUmakefile \
make/mingw32/4.9/.rpms/i686/make.mk \
make/mingw32/4.9/.rpms/SRPMS/make.mk \
make/mingw64/4.11/.rpms/make.mk \
+ make/mingw64/4.11/.rpms/i686/make.mk \
make/mingw64/4.11/.rpms/SRPMS/make.mk \
make/mingw64/4.11/.rpms/x86_64/make.mk
pkg_perlmockdir = $(pkgdatadir)/RTEMS/Mock
@@ -1623,6 +1627,12 @@ etc/mock/mingw32-i686-rtems4.9.cfg: etc/mock/mingw32-i686-rtems4.9.cfg.in etc/mo
< $(srcdir)/etc/mock/mingw32-i686-rtems4.9.cfg.in \
> etc/mock/mingw32-i686-rtems4.9.cfg
+etc/mock/mingw64-i686-rtems4.11.cfg: etc/mock/mingw64-i686-rtems4.11.cfg.in etc/mock/$(dirstamp)
+ sed \
+ -e 's,[@]buildgroupsdir[@],file://$(mockdatadir)/buildgroups,' \
+ < $(srcdir)/etc/mock/mingw64-i686-rtems4.11.cfg.in \
+ > etc/mock/mingw64-i686-rtems4.11.cfg
+
etc/mock/mingw64-x86_64-rtems4.11.cfg: etc/mock/mingw64-x86_64-rtems4.11.cfg.in etc/mock/$(dirstamp)
sed \
-e 's,[@]buildgroupsdir[@],file://$(mockdatadir)/buildgroups,' \
diff --git a/rtems-mock/bin/rtems-rpm2tar.in b/rtems-mock/bin/rtems-rpm2tar.in
index abb9f45..8dbd8fa 100755
--- a/rtems-mock/bin/rtems-rpm2tar.in
+++ b/rtems-mock/bin/rtems-rpm2tar.in
@@ -71,10 +71,15 @@ my @brpms = ();
closedir(DIR);
}
+my $distrosubdir = '';
+if ( $distid =~ m/^mingw64-.*$/ ) {
+ $distrosubdir = $arch . '/' ;
+}
+ printf STDERR "DISTROSUBDIR: $distrosubdir \n";
foreach my $i (@srpms) {
my $rpm_name = `rpm -q --qf \"%{NAME}\" -p "$srpmdir/$i"`;
- ${packages}{$i}->{name} = $rpm_name;
+ ${packages}{$i}->{name} = $distrosubdir . $rpm_name;
if ( $i =~ m/^(.*)$suffix\..*\.rpm/ ) {
${packages}{$i}->{tarfile} = "$1" . '-src.tar.bz2';
@@ -152,7 +157,7 @@ foreach my $pkg (keys %packages) {
}
# create a list of existing tarballs
-my @tarballs = `find $basedir -name '*.tar.bz2'`;
+my @tarballs = `find $basedir/$distrosubdir -name '*.tar.bz2'`;
foreach my $tar (@tarballs) { chomp $tar; }
# check if existing tarball is in hash of created tarballs
diff --git a/rtems-mock/configure b/rtems-mock/configure
index 9961aa8..d742fc9 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.68 for rtems-mock 1.20120424.4.
+# Generated by GNU Autoconf 2.68 for rtems-mock 1.20120430.2.
#
# Report bugs to <ralf.corsepius at rtems.org>.
#
@@ -559,8 +559,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='rtems-mock'
PACKAGE_TARNAME='rtems-mock'
-PACKAGE_VERSION='1.20120424.4'
-PACKAGE_STRING='rtems-mock 1.20120424.4'
+PACKAGE_VERSION='1.20120430.2'
+PACKAGE_STRING='rtems-mock 1.20120430.2'
PACKAGE_BUGREPORT='ralf.corsepius at rtems.org'
PACKAGE_URL=''
@@ -1191,7 +1191,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.20120424.4 to adapt to many kinds of systems.
+\`configure' configures rtems-mock 1.20120430.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1257,7 +1257,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of rtems-mock 1.20120424.4:";;
+ short | recursive ) echo "Configuration of rtems-mock 1.20120430.2:";;
esac
cat <<\_ACEOF
@@ -1333,7 +1333,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-rtems-mock configure 1.20120424.4
+rtems-mock configure 1.20120430.2
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1350,7 +1350,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.20120424.4, which was
+It was created by rtems-mock $as_me 1.20120430.2, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2165,7 +2165,7 @@ fi
# Define the identity of the package.
PACKAGE='rtems-mock'
- VERSION='1.20120424.4'
+ VERSION='1.20120430.2'
cat >>confdefs.h <<_ACEOF
@@ -3193,7 +3193,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.20120424.4, which was
+This file was extended by rtems-mock $as_me 1.20120430.2, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3246,7 +3246,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.20120424.4
+rtems-mock config.status 1.20120430.2
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/rtems-mock/configure.ac b/rtems-mock/configure.ac
index 060ab28..5fe25dc 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.68)
-AC_INIT([rtems-mock],[1.20120424.4],[ralf.corsepius at rtems.org],[rtems-mock])
+AC_INIT([rtems-mock],[1.20120430.2],[ralf.corsepius at rtems.org],[rtems-mock])
AM_INIT_AUTOMAKE([no-dist-gzip dist-bzip2 dist-xz tar-pax 1.11.3 foreign])
# Checks for programs.
diff --git a/rtems-mock/etc/mock/makefile.am b/rtems-mock/etc/mock/makefile.am
index 85194bb..409eedf 100644
--- a/rtems-mock/etc/mock/makefile.am
+++ b/rtems-mock/etc/mock/makefile.am
@@ -447,6 +447,16 @@ etc/mock/mingw32-i686-rtems4.9.cfg: etc/mock/mingw32-i686-rtems4.9.cfg.in etc/mo
EXTRA_DIST += etc/mock/mingw32-i686-rtems4.9.cfg.in
CLEANFILES += etc/mock/mingw32-i686-rtems4.9.cfg
+mockcfg_DATA += etc/mock/mingw64-i686-rtems4.11.cfg
+
+etc/mock/mingw64-i686-rtems4.11.cfg: etc/mock/mingw64-i686-rtems4.11.cfg.in etc/mock/$(dirstamp)
+ sed \
+ -e 's,[@]buildgroupsdir[@],file://$(mockdatadir)/buildgroups,' \
+ < $(srcdir)/etc/mock/mingw64-i686-rtems4.11.cfg.in \
+ > etc/mock/mingw64-i686-rtems4.11.cfg
+EXTRA_DIST += etc/mock/mingw64-i686-rtems4.11.cfg.in
+CLEANFILES += etc/mock/mingw64-i686-rtems4.11.cfg
+
mockcfg_DATA += etc/mock/mingw64-x86_64-rtems4.11.cfg
etc/mock/mingw64-x86_64-rtems4.11.cfg: etc/mock/mingw64-x86_64-rtems4.11.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
index 01127ec..3eba068 100644
--- a/rtems-mock/etc/mock/mingw32-i686-rtems4.11.cfg.in
+++ b/rtems-mock/etc/mock/mingw32-i686-rtems4.11.cfg.in
@@ -2,6 +2,7 @@ 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'
diff --git a/rtems-mock/etc/mock/mingw64-i686-rtems4.11.cfg.in b/rtems-mock/etc/mock/mingw64-i686-rtems4.11.cfg.in
new file mode 100644
index 0000000..6b52e5c
--- /dev/null
+++ b/rtems-mock/etc/mock/mingw64-i686-rtems4.11.cfg.in
@@ -0,0 +1,42 @@
+config_opts['root'] = 'mingw-w64-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-w64-mingw32'
+config_opts['macros']['%_build'] = 'i386-pc-linux-gnu'
+config_opts['rpmbuild_arch'] = 'i686-w64-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/17/Everything/i386/os/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-17&arch=i386
+
+[updates]
+name=updates
+# baseurl=ftp://download.fedoraproject.org/pub/fedora/linux/updates/17/i386/
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f17&arch=i386
+
+[rtems-infra]
+name=infrastructure
+baseurl=ftp://ftp.rtems.org/pub/rtems/linux/infrastructure/fedora/17/i386/
+
+[rtems-4.11]
+name=rtems-4.11
+baseurl=ftp://ftp.rtems.org/pub/rtems/linux/4.11/fedora/17/i386/
+"""
diff --git a/rtems-mock/etc/mock/mingw64-x86_64-rtems4.11.cfg.in b/rtems-mock/etc/mock/mingw64-x86_64-rtems4.11.cfg.in
index 4f7a7b4..379818b 100644
--- a/rtems-mock/etc/mock/mingw64-x86_64-rtems4.11.cfg.in
+++ b/rtems-mock/etc/mock/mingw64-x86_64-rtems4.11.cfg.in
@@ -1,4 +1,4 @@
-config_opts['root'] = 'mingw64-x86_64-rtems'
+config_opts['root'] = 'mingw-w64-x86_64-rtems'
config_opts['target_arch'] = 'i386'
config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
config_opts['macros']['%vendor'] = 'RTEMS Project http://www.rtems.org'
diff --git a/rtems-mock/make/genmk b/rtems-mock/make/genmk
index a648ded..74339a8 100755
--- a/rtems-mock/make/genmk
+++ b/rtems-mock/make/genmk
@@ -28,6 +28,7 @@ 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/x86_64 \
+ mingw64/4.11/.rpms/SRPMS mingw64/4.11/.rpms/i686 \
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 \
diff --git a/rtems-mock/make/makefile.am b/rtems-mock/make/makefile.am
index a56178a..394e688 100644
--- a/rtems-mock/make/makefile.am
+++ b/rtems-mock/make/makefile.am
@@ -152,5 +152,6 @@ nobase_make_HEADERS += make/mingw32/4.9/.rpms/i686/make.mk
nobase_make_HEADERS += make/mingw32/4.9/.rpms/SRPMS/make.mk
nobase_make_HEADERS += make/mingw64/4.11/.rpms/make.mk
+nobase_make_HEADERS += make/mingw64/4.11/.rpms/i686/make.mk
nobase_make_HEADERS += make/mingw64/4.11/.rpms/SRPMS/make.mk
nobase_make_HEADERS += make/mingw64/4.11/.rpms/x86_64/make.mk
diff --git a/rtems-mock/make/mingw64/4.11/.rpms/i686/make.mk b/rtems-mock/make/mingw64/4.11/.rpms/i686/make.mk
new file mode 100644
index 0000000..e11ab31
--- /dev/null
+++ b/rtems-mock/make/mingw64/4.11/.rpms/i686/make.mk
@@ -0,0 +1,28 @@
+$(FTPHOME)/mingw64/4.11/.rpms/i686:
+ mkdir -p $(FTPHOME)/mingw64/4.11/.rpms/i686
+DIRS += $(FTPHOME)/mingw64/4.11/.rpms/i686
+
+$(CACHEDIR)/mingw64/4.11/.rpms/i686:
+ mkdir -p $(CACHEDIR)/mingw64/4.11/.rpms/i686
+DIRS += $(CACHEDIR)/mingw64/4.11/.rpms/i686
+
+$(FTPHOME)/mingw64/4.11/.rpms/i686/repodata/repomd.xml: $(wildcard $(FTPHOME)/mingw64/4.11/.rpms/i686/*.rpm) \
+ $(CACHEDIR)/mingw64/4.11/.rpms/i686 \
+ $(FTPHOME)/mingw64/4.11/.rpms/i686
+ $(CREATEREPO) -c $(CACHEDIR)/mingw64/4.11/.rpms/i686 \
+ $(FTPHOME)/mingw64/4.11/.rpms/i686
+REPOS += $(FTPHOME)/mingw64/4.11/.rpms/i686/repodata/repomd.xml
+
+$(FTPHOME)/mingw64/obsolete/4.11/.rpms/i686:
+ mkdir -p $(FTPHOME)/mingw64/obsolete/4.11/.rpms/i686
+DIRS += $(FTPHOME)/mingw64/obsolete/4.11/.rpms/i686
+
+$(FTPHOME)/mingw64/obsolete/4.11/.rpms/i686/.stamp: $(wildcard $(FTPHOME)/mingw64/4.11/.rpms/i686/*.rpm) \
+ $(FTPHOME)/mingw64/obsolete/4.11/.rpms/i686
+ @(cd $(FTPHOME)/mingw64 && $(REPOCLEAN) 4.11/.rpms/i686) | \
+ while read a; do \
+ echo "Backing up: $$a"; \
+ mv $(FTPHOME)/mingw64/$$a $(FTPHOME)/mingw64/obsolete/$$a; \
+ done
+ touch $(FTPHOME)/mingw64/obsolete/4.11/.rpms/i686/.stamp
+OBSSTAMPS += $(FTPHOME)/mingw64/obsolete/4.11/.rpms/i686/.stamp
diff --git a/rtems-mock/make/mingw64/4.11/.rpms/make.mk b/rtems-mock/make/mingw64/4.11/.rpms/make.mk
index 4a9a2c3..f8ef373 100644
--- a/rtems-mock/make/mingw64/4.11/.rpms/make.mk
+++ b/rtems-mock/make/mingw64/4.11/.rpms/make.mk
@@ -1,2 +1,3 @@
+include make/mingw64/4.11/.rpms/i686/make.mk
include make/mingw64/4.11/.rpms/SRPMS/make.mk
include make/mingw64/4.11/.rpms/x86_64/make.mk
diff --git a/rtems-mock/perl/RTEMS/Mock/Config.pm b/rtems-mock/perl/RTEMS/Mock/Config.pm
index 0b4b2bd..fd4f96b 100644
--- a/rtems-mock/perl/RTEMS/Mock/Config.pm
+++ b/rtems-mock/perl/RTEMS/Mock/Config.pm
@@ -137,7 +137,7 @@ my @distros_4_11 = (
name => "mingw64",
version => undef,
suffix => ".mgw",
- archs => [ "x86_64" ],
+ archs => [ "i686", "x86_64" ],
srpmargs => ""
},
{ id => "mingw32 1",
More information about the vc
mailing list