Changeset: 56af19627994 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=56af19627994 Modified Files: buildtools/conf/mock/fedora-13-i386-monetdb.cfg buildtools/conf/mock/fedora-13-x86_64-monetdb.cfg buildtools/conf/mock/fedora-14-i386-monetdb.cfg buildtools/conf/mock/fedora-14-x86_64-monetdb.cfg buildtools/conf/mock/logging.ini buildtools/conf/mock/site-defaults.cfg configure.ag gdk/Makefile.ag Branch: default Log Message:
Merge with Mar2011 branch. diffs (truncated from 439 to 300 lines): diff --git a/buildtools/conf/Makefile.ag b/buildtools/conf/Makefile.ag --- a/buildtools/conf/Makefile.ag +++ b/buildtools/conf/Makefile.ag @@ -51,5 +51,3 @@ } EXTRA_DIST = rules.mk - -EXTRA_DIST_DIR = mock diff --git a/buildtools/conf/mock/fedora-13-i386-monetdb.cfg b/buildtools/conf/mock/fedora-13-i386-monetdb.cfg deleted file mode 100644 --- a/buildtools/conf/mock/fedora-13-i386-monetdb.cfg +++ /dev/null @@ -1,44 +0,0 @@ -config_opts['root'] = 'fedora-13-i386' -config_opts['target_arch'] = 'i686' -config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' -config_opts['dist'] = 'fc13' # only useful for --resultdir variable subst - -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 -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-13&arch=i386 -failovermethod=priority - -[updates-released] -name=updates -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f13&arch=i386 -failovermethod=priority - -[local] -name=local -baseurl=http://kojipkgs.fedoraproject.org/repos/dist-f13-build/latest/i386/ -cost=2000 -enabled=0 - -[monetdb] -name=monetdb -baseurl=http://localhost/MonetDB-repo/Fedora/13/i386/ -metadata_expire=1 -http_caching=none -exclude=*debuginfo* -""" - - - diff --git a/buildtools/conf/mock/fedora-13-x86_64-monetdb.cfg b/buildtools/conf/mock/fedora-13-x86_64-monetdb.cfg deleted file mode 100644 --- a/buildtools/conf/mock/fedora-13-x86_64-monetdb.cfg +++ /dev/null @@ -1,48 +0,0 @@ -config_opts['root'] = 'fedora-13-x86_64' -config_opts['target_arch'] = 'x86_64' -config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' -config_opts['dist'] = 'fc13' # only useful for --resultdir variable subst - -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 -# grub/syslinux on x86_64 need glibc-devel.i386 which pulls in glibc.i386, need to exclude all -# .i?86 packages except these. -#exclude=[0-9A-Za-fh-z]*.i?86 g[0-9A-Za-km-z]*.i?86 gl[0-9A-Za-hj-z]*.i?86 gli[0-9A-Zac-z]*.i?86 glib[0-9A-Za-bd-z]*.i?86 -# The above is not needed anymore with yum multilib policy of "best" which is the default in Fedora. - -# repos - -[fedora] -name=fedora -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-13&arch=x86_64 -failovermethod=priority - -[updates-released] -name=updates -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f13&arch=x86_64 -failovermethod=priority - -[local] -name=local -baseurl=http://kojipkgs.fedoraproject.org/repos/dist-f13-build/latest/x86_64/ -cost=2000 -enabled=0 - -[monetdb] -name=monetdb -baseurl=http://localhost/MonetDB-repo/Fedora/13/x86_64/ -metadata_expire=1 -http_caching=none -exclude=*debuginfo* -""" - - - diff --git a/buildtools/conf/mock/fedora-14-i386-monetdb.cfg b/buildtools/conf/mock/fedora-14-i386-monetdb.cfg deleted file mode 100644 --- a/buildtools/conf/mock/fedora-14-i386-monetdb.cfg +++ /dev/null @@ -1,47 +0,0 @@ -config_opts['root'] = 'fedora-14-i386' -config_opts['target_arch'] = 'i686' -config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' -config_opts['dist'] = 'fc14' # only useful for --resultdir variable subst - -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 -syslog_ident=mock -syslog_device= - -# repos - -[fedora] -name=fedora -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-14&arch=i386 -failovermethod=priority - -[updates-released] -name=updates -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f14&arch=i386 -failovermethod=priority -enabled=0 - -[local] -name=local -baseurl=http://kojipkgs.fedoraproject.org/repos/dist-f14-build/latest/i386/ -cost=2000 -enabled=0 - -[monetdb] -name=monetdb -baseurl=http://localhost/MonetDB-repo/Fedora/14/i386/ -metadata_expire=1 -http_caching=none -exclude=*debuginfo* -""" - - - diff --git a/buildtools/conf/mock/fedora-14-x86_64-monetdb.cfg b/buildtools/conf/mock/fedora-14-x86_64-monetdb.cfg deleted file mode 100644 --- a/buildtools/conf/mock/fedora-14-x86_64-monetdb.cfg +++ /dev/null @@ -1,51 +0,0 @@ -config_opts['root'] = 'fedora-14-x86_64' -config_opts['target_arch'] = 'x86_64' -config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build' -config_opts['dist'] = 'fc14' # only useful for --resultdir variable subst - -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 -syslog_ident=mock -syslog_device= -# grub/syslinux on x86_64 need glibc-devel.i386 which pulls in glibc.i386, need to exclude all -# .i?86 packages except these. -#exclude=[0-9A-Za-fh-z]*.i?86 g[0-9A-Za-km-z]*.i?86 gl[0-9A-Za-hj-z]*.i?86 gli[0-9A-Zac-z]*.i?86 glib[0-9A-Za-bd-z]*.i?86 -# The above is not needed anymore with yum multilib policy of "best" which is the default in Fedora. - -# repos - -[fedora] -name=fedora -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-14&arch=x86_64 -failovermethod=priority - -[updates-released] -name=updates -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f14&arch=x86_64 -failovermethod=priority -enabled=0 - -[local] -name=local -baseurl=http://kojipkgs.fedoraproject.org/repos/dist-f14-build/latest/x86_64/ -cost=2000 -enabled=0 - -[monetdb] -name=monetdb -baseurl=http://localhost/MonetDB-repo/Fedora/14/x86_64/ -metadata_expire=1 -http_caching=none -exclude=*debuginfo* -""" - - - diff --git a/buildtools/conf/mock/logging.ini b/buildtools/conf/mock/logging.ini deleted file mode 100644 --- a/buildtools/conf/mock/logging.ini +++ /dev/null @@ -1,84 +0,0 @@ -[formatters] -keys: detailed,simple,unadorned,state - -[handlers] -keys: simple_console,detailed_console,unadorned_console,simple_console_warnings_only - -[loggers] -keys: root,build,state,mock - -[formatter_state] -format: %(asctime)s - %(message)s - -[formatter_unadorned] -format: %(message)s - -[formatter_simple] -format: %(levelname)s: %(message)s - -;useful for debugging: -[formatter_detailed] -format: %(levelname)s %(filename)s:%(lineno)d: %(message)s - -[handler_unadorned_console] -class: StreamHandler -args: [] -formatter: unadorned -level: INFO - -[handler_simple_console] -class: StreamHandler -args: [] -formatter: simple -level: INFO - -[handler_simple_console_warnings_only] -class: StreamHandler -args: [] -formatter: simple -level: WARNING - -[handler_detailed_console] -class: StreamHandler -args: [] -formatter: detailed -level: WARNING - -; usually dont want to set a level for loggers -; this way all handlers get all messages, and messages can be filtered -; at the handler level -; -; all these loggers default to a console output handler -; -[logger_root] -level: NOTSET -handlers: simple_console - -; mock logger normally has no output -; catches stuff like mock.trace_decorator and mock.util -; dont normally want to propagate to root logger, either -[logger_mock] -level: NOTSET -handlers: -qualname: mock -propagate: 1 - -[logger_state] -level: NOTSET -; unadorned_console only outputs INFO or above -handlers: unadorned_console -qualname: mock.Root.state -propagate: 0 - -[logger_build] -level: NOTSET -handlers: simple_console_warnings_only -qualname: mock.Root.build _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
