Mailinglist Archive: opensuse-commit (1942 mails)
| < Previous | Next > |
commit build
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Mon, 17 Nov 2008 11:49:56 +0100
- Message-id: <20081117104957.1349367815D@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package build
checked in at Mon Nov 17 11:49:56 CET 2008.
--------
--- build/build.changes 2008-10-23 15:00:15.000000000 +0200
+++ /mounts/work_src_done/STABLE/build/build.changes 2008-11-13
15:06:37.000000000 +0100
@@ -1,0 +2,9 @@
+Thu Nov 13 15:01:59 CET 2008 - ro@xxxxxxx
+
+- update mkbaselibs broken by previous debuginfo change
+- various fixes for kiwi build
+- add sl11.1.conf
+- add support for --disturl
+- also save .desktopfiles for coolo
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
build-2008.10.21.tar.bz2
New:
----
build-2008.11.13.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ build.spec ++++++
--- /var/tmp/diff_new_pack.RA9923/_old 2008-11-17 11:49:51.000000000 +0100
+++ /var/tmp/diff_new_pack.RA9923/_new 2008-11-17 11:49:51.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package build (Version 2008.10.21)
+# spec file for package build (Version 2008.11.13)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -23,8 +23,8 @@
Group: Development/Tools/Building
AutoReqProv: on
Summary: A Script to Build SUSE Linux RPMs
-Version: 2008.10.21
-Release: 2
+Version: 2008.11.13
+Release: 1
Source: build-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -60,6 +60,12 @@
%{_mandir}/man1/build.1*
%changelog
+* Thu Nov 13 2008 ro@xxxxxxx
+- update mkbaselibs broken by previous debuginfo change
+- various fixes for kiwi build
+- add sl11.1.conf
+- add support for --disturl
+- also save .desktopfiles for coolo
* Thu Oct 23 2008 ro@xxxxxxx
- disable ppc:ia32 stuff again, causes trouble and can not work
* Tue Oct 21 2008 jblunck@xxxxxxx
@@ -168,7 +174,7 @@
- make dist autodetection work with opensuse
- fix macro sequencing and expression parser bugs
- treat preinstalls as keep
-* Thu Aug 24 2006 ro@xxxxxxx
+* Wed Aug 23 2006 ro@xxxxxxx
- init_buildsystem: when preinstalling, handle only sh scripts
* Wed Jun 14 2006 mls@xxxxxxx
- support for buildservice and debian packages
@@ -233,7 +239,7 @@
- fix BUILD_DIR security issue (#35281)
* Thu Mar 11 2004 ro@xxxxxxx
- adapted for 9.1
-* Tue Nov 11 2003 mmj@xxxxxxx
+* Mon Nov 10 2003 mmj@xxxxxxx
- Accept "-h" for help
- rpm -ba is now rpmbuild -ba
- Add Maximum RPM reference
++++++ build-2008.10.21.tar.bz2 -> build-2008.11.13.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/build-2008.10.21/build new/build-2008.11.13/build
--- old/build-2008.10.21/build 2008-10-20 17:59:15.000000000 +0200
+++ new/build-2008.11.13/build 2008-11-13 14:54:42.000000000 +0100
@@ -60,6 +60,7 @@
BUILD_DEBUG=
PERSONALITY_SYSCALL=
INCARNATION=
+DISTURL=
export PATH=$BUILD_DIR:$PATH
@@ -174,7 +175,7 @@
if test -n "$RUNNING_IN_VM" ; then
cd /
if test -n "$VM_SWAP" -a -e "$VM_SWAP" ; then
- swapoff "$VM_SWAP"
+ swapoff "$VM_SWAP" 2>/dev/null
echo -n "BUILDSTATUS$1" >"$VM_SWAP"
fi
exec >&0 2>&0 # so that the logging tee finishes
@@ -651,6 +652,10 @@
INCARNATION=$ARG
shift
;;
+ --disturl)
+ DISTURL=$ARG
+ shift
+ ;;
----noarg)
echo "$ARG does not take an argument"
cleanup_and_exit
@@ -849,6 +854,17 @@
SRCDIR="${SPECFILE%/*}"
SPECFILE="${SPECFILE##*/}"
+ BUILDTYPE=
+ case $SPECFILE in
+ *.spec) BUILDTYPE=spec ;;
+ *.dsc) BUILDTYPE=dsc ;;
+ *.kiwi) BUILDTYPE=kiwi ;;
+ esac
+ if test -z "$BUILDTYPE" ; then
+ echo "don't know how to build $SPECFILE"
+ cleanup_and_exit 1
+ fi
+
cd "$SRCDIR"
if [ -z "$RUNNING_IN_VM" ]; then
@@ -926,7 +942,11 @@
if ! test "$MYSRCDIR" = $BUILD_ROOT/.build-srcdir ; then
rm -rf $BUILD_ROOT/.build-srcdir
mkdir $BUILD_ROOT/.build-srcdir
- cp -p "$MYSRCDIR"/* $BUILD_ROOT/.build-srcdir
+ if test "$BUILDTYPE" = kiwi ; then
+ cp -a "$MYSRCDIR"/* $BUILD_ROOT/.build-srcdir
+ else
+ cp -p "$MYSRCDIR"/* $BUILD_ROOT/.build-srcdir
+ fi
MYSRCDIR=$BUILD_ROOT/.build-srcdir
fi
Q="'\''"
@@ -950,6 +970,7 @@
echo "REASON='${REASON//"'"/$Q}'" >> $BUILD_ROOT/.build/build.data
echo "CHANGELOG='${CHANGELOG//"'"/$Q}'" >> $BUILD_ROOT/.build/build.data
echo "INCARNATION='${INCARNATION//"'"/$Q}'" >>
$BUILD_ROOT/.build/build.data
+ echo "DISTURL='${DISTURL//"'"/$Q}'" >> $BUILD_ROOT/.build/build.data
# FIXME: this depends on the kernel and vm.
# could be hda2, sda2 for xen or hdb/sdb for qemu
test -n "$VM_SWAP" && echo "VM_SWAP='${VM_SWAPDEV:-/dev/hda2}'" >>
$BUILD_ROOT/.build/build.data
@@ -1059,9 +1080,10 @@
if test -z "$BUILD_DIST" -a -e "$BUILD_ROOT/.guessed_dist" ; then
BUILD_DIST=`cat $BUILD_ROOT/.guessed_dist`
+ echo "assuming dist $BUILD_DIST"
fi
- if test "$SPECFILE" = "${SPECFILE%.dsc}" ; then
+ if test "$BUILDTYPE" = spec ; then
TOPDIR=`chroot $BUILD_ROOT rpm --eval '%_topdir'`
else
TOPDIR=/usr/src/packages
@@ -1096,6 +1118,8 @@
egrep '^#[ ]*norootforbuild[ ]*$' >/dev/null <$SPECFILE &&
BUILD_USER=abuild
fi
test -n "$NOROOTFORBUILD" && BUILD_USER=abuild
+ test "$BUILDTYPE" = kiwi && BUILD_USER=root
+
if test $BUILD_USER = abuild ; then
if ! egrep '^abuild:' >/dev/null <$BUILD_ROOT/etc/passwd ; then
echo 'abuild::399:399:Autobuild:/home/abuild:/bin/bash'
@@ -1137,14 +1161,24 @@$BUILD_ROOT/etc/passwd
test $BUILD_USER = abuild && chown 399:399 $BUILD_ROOT$TOPDIR/$i
done
test -e $BUILD_ROOT/exit && cleanup_and_exit
+
mkdir -p $BUILD_ROOT$TOPDIR/SOURCES
- cp -p "$MYSRCDIR"/* $BUILD_ROOT$TOPDIR/SOURCES/
+ if test "$BUILDTYPE" = kiwi ; then
+ mkdir -p $BUILD_ROOT$TOPDIR/KIWI
+ if test "$MYSRCDIR" = $BUILD_ROOT/.build-srcdir ; then
+ mv "$MYSRCDIR"/* $BUILD_ROOT$TOPDIR/SOURCES/
+ else
+ cp -a "$MYSRCDIR"/* $BUILD_ROOT$TOPDIR/SOURCES/
+ fi
+ else
+ cp -p "$MYSRCDIR"/* $BUILD_ROOT$TOPDIR/SOURCES/
+ fi
test "$MYSRCDIR" = $BUILD_ROOT/.build-srcdir && rm -rf "$MYSRCDIR"
CHANGELOGARGS=
test -n "$CHANGELOG" -a -f "$BUILD_ROOT/.build-changelog" &&
CHANGELOGARGS="--changelog $BUILD_ROOT/.build-changelog"
- if test "$SPECFILE" = "${SPECFILE%.dsc}" ; then
+ if test "$BUILDTYPE" = spec ; then
# do buildrequires/release substitution
args=()
if test -n "$RELEASE"; then
@@ -1180,7 +1214,7 @@
fi
fi
- if test "$SPECFILE" != "${SPECFILE%.dsc}" ; then
+ if test "$BUILDTYPE" = dsc ; then
rm -rf $BUILD_ROOT$TOPDIR/BUILD
test $BUILD_USER = abuild && chown 399:399 $BUILD_ROOT$TOPDIR
DEB_TRANSFORM=
@@ -1199,6 +1233,7 @@
chroot $BUILD_ROOT su -c "dpkg-source -x $TOPDIR/SOURCES/$SPECFILE
$TOPDIR/BUILD" - $BUILD_USER
fi
fi
+
if test $BUILD_USER = abuild ; then
chown -R 399:399 $BUILD_ROOT$TOPDIR/*
else
@@ -1219,7 +1254,7 @@
BUILD_SUCCEDED=false
- if test "$SPECFILE" = "${SPECFILE%.dsc}" ; then
+ if test "$BUILDTYPE" = spec ; then
test -z "$BUILD_RPM_BUILD_STAGE" && BUILD_RPM_BUILD_STAGE=-ba
# XXX: move _srcdefattr to macro file?
@@ -1231,6 +1266,10 @@
rpmbopts[${#rpmbopts[@]}]='--define'
rpmbopts[${#rpmbopts[@]}]="jobs $BUILD_JOBS"
fi
+ if [ -n "$DISTURL" ]; then
+ rpmbopts[${#rpmbopts[@]}]='--define'
+ rpmbopts[${#rpmbopts[@]}]="disturl $DISTURL"
+ fi
if test -s "$BUILD_ROOT/usr/lib/rpm/mandriva/macros" ; then
rpmbopts[${#rpmbopts[@]}]='--eval'
rpmbopts[${#rpmbopts[@]}]="%undefine _enable_debug_packages"
@@ -1251,7 +1290,9 @@
> $BUILD_ROOT/.build.command
chmod 755 $BUILD_ROOT/.build.command
chroot $BUILD_ROOT su -c /.build.command - $BUILD_USER < /dev/null &&
BUILD_SUCCEDED=true
- else
+ fi
+
+ if test "$BUILDTYPE" = dsc ; then
chroot $BUILD_ROOT su -c "cd $TOPDIR/BUILD && dpkg-buildpackage -us -uc
-rfakeroot-tcp" - $BUILD_USER < /dev/null && BUILD_SUCCEDED=true
mkdir -p $BUILD_ROOT/$TOPDIR/DEBS
for DEB in $BUILD_ROOT/$TOPDIR/*.deb ; do
@@ -1259,6 +1300,38 @@
done
fi
+ if test "$BUILDTYPE" = kiwi ; then
+ # run createrepo on the repositories
+ if test -d $BUILD_ROOT/$TOPDIR/SOURCES/repos ; then
+ (
+ cd $BUILD_ROOT/$TOPDIR/SOURCES/repos
+ find . | sed -n -e 's/^\.\///' -e
'/.*:\/[^\/]*[^\/:]\/[^\/]*[^\/:]$/p' | while read d ; do
+ test -d $BUILD_ROOT/$TOPDIR/SOURCES/repos/$d/repodata &&
continue
+ echo "creating repodata for $d"
+ chroot $BUILD_ROOT createrepo "$TOPDIR/SOURCES/repos/$d"
+ done
+ )
+ fi
+ # unpack tar files in image directories
+ if test -d $BUILD_ROOT/$TOPDIR/SOURCES/images ; then
+ (
+ cd $BUILD_ROOT/$TOPDIR/SOURCES/images
+ find . | sed -n -e 's/^\.\///' -e
'/.*:\/[^\/]*[^\/:]\/[^\/]*[^\/:]$/p' | while read d ; do
+ for t in $BUILDROOT/$TOPDIR/SOURCES/images/$d/root.tar* ; do
+ test -f $t || continue
+ mkdir -p $BUILDROOT/$TOPDIR/SOURCES/images/$d/root
+ chroot $BUILD_ROOT tar -C $TOPDIR/SOURCES/images/$d/root
-xf "$TOPDIR/SOURCES/images/$d/$t{##*/}"
+ done
+ done
+ )
+ fi
+ rm -f $BUILD_ROOT/$TOPDIR/SOURCES/config.xml
+ ln -s $SPECFILE $BUILD_ROOT/$TOPDIR/SOURCES/config.xml
+ if chroot $BUILD_ROOT su -c "cd $TOPDIR/SOURCES && kiwi --prepare
$TOPDIR/SOURCES --logfile terminal --root $TOPDIR/KIWIROOT" - $BUILD_USER <
/dev/null ; then
+ chroot $BUILD_ROOT su -c "kiwi --create $TOPDIR/KIWIROOT --logfile
terminal -d $TOPDIR/KIWI --type iso" - $BUILD_USER < /dev/null &&
BUILD_SUCCEDED=true
+ fi
+ fi
+
test "$BUILD_SUCCEDED" = true || cleanup_and_exit 1
test -d "$SRCDIR" && cd "$SRCDIR"
done
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/build-2008.10.21/changelog2spec
new/build-2008.11.13/changelog2spec
--- old/build-2008.10.21/changelog2spec 2008-10-20 17:59:15.000000000 +0200
+++ new/build-2008.11.13/changelog2spec 2008-11-13 14:54:42.000000000 +0100
@@ -4,6 +4,10 @@
# Convert a SUSE or Debian changelog file to rpm format
#
+BEGIN {
+ unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
+}
+
use Date::Parse;
use Time::Zone;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/build-2008.10.21/configs/default.conf
new/build-2008.11.13/configs/default.conf
--- old/build-2008.10.21/configs/default.conf 2008-11-17 11:49:51.000000000
+0100
+++ new/build-2008.11.13/configs/default.conf 2008-11-17 11:49:51.000000000
+0100
@@ -1 +1 @@
-symbolic link to sl11.0.conf
+symbolic link to sl11.1.conf
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/build-2008.10.21/configs/sl11.1.conf
new/build-2008.11.13/configs/sl11.1.conf
--- old/build-2008.10.21/configs/sl11.1.conf 1970-01-01 01:00:00.000000000
+0100
+++ new/build-2008.11.13/configs/sl11.1.conf 2008-11-13 14:54:42.000000000
+0100
@@ -0,0 +1,395 @@
+%define gcc_version 43
+
+Preinstall: aaa_base acl attr bash coreutils diffutils
+Preinstall: filesystem fillup glibc grep insserv libacl libattr
+Preinstall: libbz2-1 libgcc%{gcc_version} libxcrypt m4 libncurses5 pam
+Preinstall: permissions popt libreadline5 rpm sed tar zlib libselinux1
+
+Runscripts: aaa_base
+
+VMinstall: util-linux perl-base libdb-4_5 libvolume_id
+
+Required: autoconf automake binutils bzip2 gcc gcc%{gcc_version}
+Required: gettext-runtime glibc libtool perl rpm zlib libmpfr1 gmp
+Required: libncurses5
+
+Support: audit-libs cpio cpp cpp%{gcc_version} cracklib cvs
+Support: file findutils gawk gdbm gettext-tools
+Support: glibc-devel glibc-locale groff gzip info less
+Support: libbz2-devel libdb-4_5
+Support: libstdc++%{gcc_version}
+Support: libvolume_id libxcrypt libzio
+Support: linux-kernel-headers make man netcfg
+Support: net-tools pam-modules patch perl-base sysvinit
+Support: texinfo timezone util-linux login
+Support: libgomp43 libuuid1 psmisc
+Support: terminfo-base
+
+Support: build brp-check-suse post-build-checks rpmlint-Factory
+Keep: brp-check-suse
+
+%ifarch ia64
+Support: libunwind libunwind-devel
+%endif
+
+Keep: audit-libs binutils bzip2 cpio cpp cracklib file findutils gawk gcc
gcc-ada gcc-c++
+Keep: gdbm glibc-devel glibc-locale gzip libada
+Keep: libunwind libunwind-devel libzio make pam-devel pam-modules
+Keep: patch perl-base perl rcs timezone gmp libmpfr1
+Keep: cpp43 gcc43 gcc43-ada libstdc++43
+Keep: cpp42 gcc42 gcc42-ada libstdc++42
+Keep: cpp41 gcc41 gcc41-ada libstdc++41
+Keep: java-1_6_0-openjdk java-1_6_0-openjdk-devel
+
+Prefer: -openSUSE-build-key
+Prefer: libreadline5
+Prefer: libdb_java-4_5 libicu
+Prefer: cracklib-dict-small postfix
+Prefer: jta libpng fam mozilla mozilla-nss
+Prefer: unixODBC libsoup glitz
+Prefer: gnome-panel desktop-data-openSUSE gnome2-SuSE
+Prefer: mono-nunit gecko-sharp2
+Prefer: apache2-prefork Mesa openmotif-libs ghostscript-mini
ghostscript-library
+Prefer: gtk-sharp2 glib-sharp2 glade-sharp2
+Prefer: libzypp-zmd-backend novell-NLDAPsdk zaptel-kmp-default
+Prefer: hbedv-dazuko-kmp-default dazuko-kmp-default
vmware-wkstnmods-kmp-default
+Prefer: virtualbox-kmp-default
+Prefer: libstdc++%{gcc_version} libgcc%{gcc_version}
+Prefer: libstdc++%{gcc_version}-32bit libstdc++%{gcc_version}-64bit
+Prefer: libstroke
+Prefer: gnome-sharp2:art-sharp2 gnome-sharp:art-sharp
+Prefer: ifolder3:gnome-sharp2 ifolder3:gconf-sharp2
+Prefer: nautilus-ifolder3:gnome-sharp2 inkscape:gtkmm24
+Prefer: gconf-sharp2:glade-sharp2 gconf-sharp:glade-sharp
+Prefer: gjdoc:antlr-bootstrap
+Prefer: tomboy:gconf-sharp2 tomboy:gnome-sharp2
+Prefer: zmd:libzypp-zmd-backend
+Prefer: yast2-packagemanager-devel:yast2-packagemanager
+Prefer: glitz-32bit:Mesa-32bit
+Prefer: poppler-tools
+Prefer: banshee:banshee-engine-gst helix-banshee:helix-banshee-engine-gst
+Prefer: java-1_5_0-ibm:java-1_5_0-ibm-alsa
+Prefer: microcode_ctl:kernel-default
+Prefer: notification-daemon
+Prefer: pkg-config gtk-doc wlan-kmp-default lua-libs
+Prefer: gnu-jaf classpathx-mail avahi-compat-mDNSResponder
yast2-control-center-qt
+Prefer: vim-normal myspell-american wine
+Prefer: eclipse-platform eclipse-scripts
+Prefer: yast2-theme-openSUSE
+Prefer: amarok:amarok-xine
+Prefer: kdenetwork3-vnc:tightvnc
+Prefer: libgweather0 jessie ndesk-dbus ndesk-dbus-glib tomcat6-jsp-2_1-api
tomcat6-servlet-2_5-api
+Prefer: icewm-lite
+Prefer: patterns-openSUSE-GNOME-cd:banshee
+Prefer: yast2-ncurses-pkg
+Prefer: monodevelop: mono-addins
+Prefer: ant-trax:saxon
+Prefer: gnome-session:gnome-session-branding-openSUSE
+Prefer: gnome-session:gconf2-branding-openSUSE
+Prefer: xfce4-desktop:xfce4-desktop-branding-openSUSE
+Prefer: bundle-lang-gnome:gnome-session-branding-openSUSE
+Prefer: texlive-xmltex texlive-tools texlive-jadetex
+Prefer: mono-web:mono-data-sqlite
+Prefer: gnome-games:gnuchess
+Prefer: OpenOffice_org:OpenOffice_org-branding-upstream
+Prefer: gimp:gimp-branding-upstream
+Prefer: libesd-devel:esound
+Prefer: libesd0:esound-daemon
+Prefer: glib2:glib2-branding-upstream
+Prefer: kdebase4-workspace:kdebase4-workspace-branding-upstream
+Prefer: mysql-connector-java:java-1_5_0-gcj-compat
+Prefer: -geronimo-jta-1_0_1B-api
+Prefer: rhino:xmlbeans-mini
+Prefer: ghostscript-devel:ghostscript-library
+Prefer: gdm:gdm-branding-upstream
+Prefer: rpcbind log4j-mini eclipse-source
+Prefer: mx4j:log4j-mini
+Prefer: podsleuth:sg3_utils
+Prefer: libcdio_cdda0 libcdio_paranoia0
+Prefer: mozilla-xulrunner190-32bit
+Prefer: boo tog-pegasus
+Prefer: kde4-kupdateapplet:kde4-kupdateapplet-zypp
+Prefer: ant:xerces-j2
+Prefer: -bundle-lang-kde-de -bundle-lang-kde-en -bundle-lang-kde-es
+Prefer: -bundle-lang-kde-fr -bundle-lang-kde-pt
+Prefer: -bundle-lang-kde-zh -bundle-lang-kde-ja -bundle-lang-kde-ru
-bundle-lang-kde-pl
+Prefer: -bundle-lang-kde-sv -bundle-lang-kde-ko -bundle-lang-kde-fi
-bundle-lang-kde-da
+Prefer: -bundle-lang-kde-cs -bundle-lang-kde-nl -bundle-lang-kde-hu
-bundle-lang-kde-nb
+Prefer: -bundle-lang-kde-it -bundle-lang-kde-ca -bundle-lang-kde-ar
+Prefer: -bundle-lang-gnome-es -bundle-lang-gnome-de -bundle-lang-gnome-fr
+Prefer: -bundle-lang-gnome-pt -bundle-lang-gnome-en
+Prefer: -bundle-lang-gnome-zh -bundle-lang-gnome-ja -bundle-lang-gnome-ru
-bundle-lang-gnome-cs
+Prefer: -bundle-lang-gnome-ko -bundle-lang-gnome-da -bundle-lang-gnome-nl
-bundle-lang-gnome-hu
+Prefer: -bundle-lang-gnome-pl -bundle-lang-gnome-fi -bundle-lang-gnome-nb
-bundle-lang-gnome-sv
+Prefer: -bundle-lang-gnome-it -bundle-lang-gnome-ca -bundle-lang-gnome-ar
+Prefer: -bundle-lang-common-es -bundle-lang-common-de -bundle-lang-common-fr
+Prefer: -bundle-lang-common-pt -bundle-lang-common-en
+Prefer: -bundle-lang-common-ja -bundle-lang-common-zh -bundle-lang-common-cs
-bundle-lang-common-ru
+Prefer: -bundle-lang-common-nl -bundle-lang-common-hu -bundle-lang-common-pl
-bundle-lang-common-da
+Prefer: -bundle-lang-common-ko -bundle-lang-common-nb -bundle-lang-common-fi
-bundle-lang-common-sv
+Prefer: -bundle-lang-common-it -bundle-lang-common-ca -bundle-lang-common-ar
+Prefer: -libgcc-mainline -libstdc++-mainline -gcc-mainline-c++
+Prefer: -libgcj-mainline -viewperf -compat -compat-openssl097g
+Prefer: -zmd -OpenOffice_org -pam-laus -libgcc-tree-ssa -busybox-links
+Prefer: libsepol1
+Prefer: libexpat1
+
+Prefer: -NX -xaw3dd -db43
+Prefer: -xerces-j2-xml-resolver -xerces-j2-xml-apis
+Prefer: -vmware-player
+Prefer: libgcc%{gcc_version} libgcc%{gcc_version}-32bit
libgcc%{gcc_version}-64bit
+Prefer: libgcc%{gcc_version}-x86 libffi%{gcc_version} libgcj_bc%{gcc_version}
+Prefer: libgomp%{gcc_version} libgomp%{gcc_version}-32bit
libgomp%{gcc_version}-64bit
+Prefer: libmudflap%{gcc_version} libmudflap%{gcc_version}-32bit
libmudflap%{gcc_version}-64bit
+Prefer: libobjc%{gcc_version}
+Prefer: -libnetpbm -libcdio7-mini -libiso9660-5-mini
+Prefer: -libcdio-mini -faac-mini
+Prefer: -seamonkey
+Prefer: -libdb-4_4-devel -libevoldap-2_4-2
+Conflict: ghostscript-library:ghostscript-mini
+Conflict: ghostscript-fonts-std:ghostscript-mini
+Prefer: -libopenal0-soft -openal-soft -lsb-buildenv
+Prefer: -libevent
+Prefer: gnu-crypto libusb-compat-devel
+Prefer: libusb-0_1-4
+Prefer: CASA_auth_token_svc:xerces-j2
+Prefer: OpenOffice_org:xerces-j2
+Prefer: k3b:libdvdread4
+
+Ignore: cracklib:cracklib-dict
+Ignore:
aaa_base:aaa_skel,suse-release,logrotate,ash,mingetty,distribution-release,udev
+Ignore:
gettext-tools:libgcj,libstdc++-devel,libgcj41,libstdc++41-devel,libgcj42,libstdc++42-devel
+Ignore: libgcj43,libstdc++43-devel
+Ignore: pwdutils:openslp
+Ignore: pam-modules:resmgr
+Ignore: rpm:suse-build-key,build-key
+Ignore: bind-utils:bind-libs
+Ignore: alsa:dialog,pciutils
+Ignore: portmap:syslogd
+Ignore: fontconfig:freetype2
+Ignore: fontconfig-devel:freetype2-devel
+Ignore: xorg-x11-libs:freetype2
+Ignore:
xorg-x11:x11-tools,resmgr,xkeyboard-config,xorg-x11-Mesa,libusb,freetype2,libjpeg,libpng
+Ignore: xorg-x11-server:xorg-x11-driver-input,xorg-x11-driver-video
+Ignore: apache2:logrotate
+Ignore: arts:alsa,audiofile,resmgr,libogg,libvorbis
+Ignore:
kdelibs3:alsa,arts,pcre,OpenEXR,aspell,cups-libs,mDNSResponder-lib,krb5,libjasper
+Ignore: kdelibs3-devel:libvorbis-devel
+Ignore:
kdebase3:kdebase3-ksysguardd,OpenEXR,dbus-1,dbus-1-qt,hal,powersave,openslp,libusb
+Ignore: kdebase3-SuSE:release-notes
+Ignore: jack:alsa,libsndfile
+Ignore: libxml2-devel:readline-devel
+Ignore:
gnome-vfs2:gnome-mime-data,desktop-file-utils,cdparanoia,dbus-1,dbus-1-glib,hal,libsmbclient,fam,file_alteration
+Ignore: libgda:file_alteration
+Ignore: gnutls:lzo,libopencdk
+Ignore: gnutls-devel:lzo-devel,libopencdk-devel
+Ignore: pango:cairo,glitz,libpixman,libpng
+Ignore: pango-devel:cairo-devel
+Ignore: cairo-devel:libpixman-devel
+Ignore: libgnomeprint:libgnomecups
+Ignore: libgnomeprintui:libgnomecups
+Ignore: orbit2:libidl
+Ignore: orbit2-devel:libidl,libidl-devel,indent
+Ignore: qt3:libmng
+Ignore: qt-sql:qt_database_plugin
+Ignore: gtk2:libpng,libtiff
+Ignore: libgnomecanvas-devel:glib-devel
+Ignore: libgnomeui:gnome-icon-theme,shared-mime-info
+Ignore: scrollkeeper:docbook_4
+Ignore: gnome-desktop:libgnomesu,startup-notification
+Ignore: python-devel:python-tk
+Ignore: gnome-pilot:gnome-panel
+Ignore: gnome-panel:control-center2
+Ignore: gnome-menus:kdebase3
+Ignore: gnome-main-menu:rug
+Ignore: libbonoboui:gnome-desktop
+Ignore: postfix:pcre
+Ignore: docbook_4:iso_ent,xmlcharent
+Ignore:
control-center2:nautilus,evolution-data-server,gnome-menus,gstreamer-plugins,gstreamer,metacity,mozilla-nspr,mozilla,libxklavier,gnome-desktop,startup-notification
+Ignore: docbook-xsl-stylesheets:xmlcharent
+Ignore: liby2util-devel:libstdc++-devel,openssl-devel
+Ignore:
yast2:yast2-ncurses,yast2_theme,perl-Config-Crontab,yast2-xml,SuSEfirewall2
+Ignore: yast2-core:netcat,hwinfo,wireless-tools,sysfsutils
+Ignore:
yast2-core-devel:libxcrypt-devel,hwinfo-devel,blocxx-devel,sysfsutils,libstdc++-devel
+Ignore: yast2-packagemanager-devel:rpm-devel,curl-devel,openssl-devel
+Ignore: yast2-devtools:libxslt
+Ignore:
yast2-installation:yast2-update,yast2-mouse,yast2-country,yast2-bootloader,yast2-packager,yast2-network,yast2-online-update,yast2-users,release-notes,autoyast2-installation
+Ignore: yast2-bootloader:bootloader-theme
+Ignore: yast2-packager:yast2-x11
+Ignore: yast2-x11:sax2-libsax-perl
+Ignore: yast2-network:yast2-inetd
+Ignore: openslp-devel:openssl-devel
+Ignore: java-1_4_2-sun:xorg-x11-libs
+Ignore: java-1_4_2-sun-devel:xorg-x11-libs
+Ignore:
tetex:xorg-x11-libs,expat,fontconfig,freetype2,libjpeg,ghostscript-x11,xaw3d,gd,dialog,ed
+Ignore: texlive-bin:ghostscript-x11
+Ignore: texlive-bin-omega:ghostscript-x11
+Ignore: yast2-country:yast2-trans-stats
+Ignore: tpb:tpctl-kmp
+Ignore: tpctl:tpctl-kmp
+Ignore: zaptel:zaptel-kmp
+Ignore: mkinitrd:pciutils
+Ignore: pciutils:pciutils-ids
+
+Ignore: libgcc:glibc-32bit
+Ignore: libgcc41:glibc-32bit
+Ignore: libgcc42:glibc-32bit
+Ignore: libgcc43:glibc-32bit
+Ignore: libstdc++:glibc-32bit
+Ignore: libstdc41++:glibc-32bit
+Ignore: libstdc42++:glibc-32bit
+Ignore: libstdc43++:glibc-32bit
+Ignore: ncurses-32bit
+
+Ignore: susehelp:susehelp_lang,suse_help_viewer
+Ignore: mailx:smtp_daemon
+Ignore: cron:smtp_daemon
+Ignore: hotplug:syslog
+Ignore: pcmcia:syslog
+Ignore: openct:syslog
+Ignore: avalon-logkit:servlet
+Ignore: jython:servlet
+Ignore: ispell:ispell_dictionary,ispell_english_dictionary
+Ignore: aspell:aspel_dictionary,aspell_dictionary
+Ignore: smartlink-softmodem:kernel,kernel-nongpl
+Ignore: OpenOffice_org-de:myspell-german-dictionary
+Ignore: OpenOffice_org:OpenOffice_org-i18n
+Ignore: mediawiki:php-session,php-gettext,php-zlib,php-mysql,mod_php_any
+Ignore:
squirrelmail:mod_php_any,php-session,php-gettext,php-iconv,php-mbstring,php-openssl
+
+Ignore: simias:mono(log4net)
+Ignore: zmd:mono(log4net)
+Ignore:
horde:mod_php_any,php-gettext,php-mcrypt,php-imap,php-pear-log,php-pear,php-session,php
+
+Ignore: xerces-j2:xml-commons-apis,xml-commons-resolver
+Ignore: xdg-menu:desktop-data
+Ignore: nessus-libraries:nessus-core
+Ignore: evolution:yelp
+
+Ignore:
mono-tools:mono(gconf-sharp),mono(glade-sharp),mono(gnome-sharp),mono(gtkhtml-sharp),mono(atk-sharp),mono(gdk-sharp),mono(glib-sharp),mono(gtk-sharp),mono(pango-sharp)
+Ignore: gecko-sharp2:mono(glib-sharp),mono(gtk-sharp)
+
+Ignore:
vcdimager:libcdio.so.6,libcdio.so.6(CDIO_6),libiso9660.so.4,libiso9660.so.4(ISO9660_4)
+Ignore: libcdio:libcddb.so.2
+
+Ignore: gnome-libs:libgnomeui
+Ignore: nautilus:gnome-themes
+Ignore: gnome-panel:gnome-themes
+Ignore: gnome-panel:tomboy
+Ignore: NetworkManager:NetworkManager-client
+Ignore: libbeagle:beagle
+Ignore: coreutils:coreutils-lang
+Ignore: cpio:cpio-lang
+Ignore: glib2:glib2-lang
+Ignore: gtk2:gtk2-lang
+Ignore: gtk:gtk-lang
+Ignore: atk:atk-lang
+Ignore: hal:pm-utils
+Ignore: MozillaThunderbird:pinentry-dialog
+Ignore: seamonkey:pinentry-dialog
+Ignore: gpg2:gpg2-lang
+Ignore: util-linux:util-linux-lang
+Ignore: suseRegister:distribution-release
+
+Ignore: icecream:gcc-c++
+Ignore: no
+Ignore: package
+Ignore: provides
+Ignore: j9vm/libjvm.so()(64bit)
+Ignore: kdepim3:suse_help_viewer
+Ignore: kdebase3-SuSE:kdebase3-SuSE-branding
+Ignore: kio_sysinfo:kdebase3-SuSE-branding
+Ignore: gnome-menus:gnome-menus-branding
+Ignore: epiphany:epiphany-branding
+Ignore: phonon:phonon-backend
+Ignore: openwbem-devel
+Ignore: MozillaFirefox:MozillaFirefox-branding
+Ignore: yast2:yast2-branding
+Ignore: yast2-theme-SLE:yast2-branding
+%ifnarch ia64 s390 s390x ppc ppc64
+Prefer: java-1_6_0-openjdk java-1_6_0-openjdk-devel
+%endif
+%ifarch s390 s390x ppc ppc64
+Prefer: java-1_6_0-ibm java-1_6_0-ibm-devel
+%endif
+%ifarch ia64
+Prefer: java-1_6_0-bea java-1_6_0-bea-devel
+%endif
+
+Prefer: -java-1_5_0-gcj-compat-devel
+%ifnarch ia64 s390 s390x ppc ppc64
+Substitute: java2-devel-packages java-1_6_0-openjdk-devel
+%else
+ %ifarch s390 s390x ppc ppc64
+Substitute: java2-devel-packages java-1_6_0-ibm-devel unzip update-alternatives
+ %endif
+ %ifarch ia64
+Substitute: java2-devel-packages java-1_6_0-bea-devel unzip update-alternatives
+ %endif
+%endif
+
+%ifarch x86_64 ppc64 s390x sparc64
+Substitute: glibc-devel-32bit glibc-devel-32bit glibc-32bit
+%else
+ %ifarch ppc
+Substitute: glibc-devel-32bit glibc-devel-64bit
+ %else
+Substitute: glibc-devel-32bit
+ %endif
+%endif
+
+%ifarch %ix86
+Substitute: kernel-binary-packages kernel-default kernel-smp kernel-bigsmp
kernel-debug kernel-xen
+%endif
+%ifarch ia64
+Substitute: kernel-binary-packages kernel-default kernel-debug
+%endif
+%ifarch x86_64
+Substitute: kernel-binary-packages kernel-default kernel-smp kernel-xen
+%endif
+%ifarch ppc
+Substitute: kernel-binary-packages kernel-default kernel-ppc64 kernel-ps3
+%endif
+%ifarch ppc64
+Substitute: kernel-binary-packages kernel-default kernel-ppc64 kernel-ps3
+%endif
+%ifarch s390
+Substitute: kernel-binary-packages kernel-s390
+%endif
+%ifarch s390x
+Substitute: kernel-binary-packages kernel-default
+%endif
+
+%ifarch ppc64
+Substitute: mono-devel mono-devel mono-biarchcompat
+Substitute: mono-basic mono-basic mono-biarchcompat
+Substitute: mono-tools mono-tools mono-biarchcompat
+%endif
+
+
+Optflags: i586 -march=i586 -mtune=i686 -fmessage-length=0
+Optflags: i686 -march=i686 -mtune=i686 -fmessage-length=0
+Optflags: x86_64 -fmessage-length=0
+Optflags: ppc -fmessage-length=0
+Optflags: ppc64 -fmessage-length=0
+Optflags: ia64 -fmessage-length=0
+Optflags: s390 -march=z9-109 -mtune=z10 -fmessage-length=0
+Optflags: s390x -march=z9-109 -mtune=z10 -fmessage-length=0
+
+Optflags: * -O2 -fmessage-length=0 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector
-funwind-tables -fasynchronous-unwind-tables
+
+%define suse_version 1110
+
+Macros:
+%insserv_prereq insserv sed
+%fillup_prereq fillup coreutils grep diffutils
+%suseconfig_fonts_prereq perl aaa_base
+%install_info_prereq info
+%kernel_module_package_buildreq kernel-source kernel-syms
+%kernel_module_package_buildreqs kernel-source kernel-syms
+
+%suse_version 1110
+%sles_version 0
+%ul_version 0
+%do_profiling 1
+%_vendor suse
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/build-2008.10.21/configs/sles11.conf
new/build-2008.11.13/configs/sles11.conf
--- old/build-2008.10.21/configs/sles11.conf 1970-01-01 01:00:00.000000000
+0100
+++ new/build-2008.11.13/configs/sles11.conf 2008-11-17 11:49:51.000000000
+0100
@@ -0,0 +1 @@
+symbolic link to sl11.1.conf
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/build-2008.10.21/expanddeps
new/build-2008.11.13/expanddeps
--- old/build-2008.10.21/expanddeps 2008-10-20 17:59:15.000000000 +0200
+++ new/build-2008.11.13/expanddeps 2008-11-13 14:54:42.000000000 +0100
@@ -60,8 +60,8 @@
$archs = '' unless defined $archs;
die("you must specfiy a depfile!\n") unless defined $rpmdeps;
-my @extradeps = grep {!/\.(?:spec|dsc)$/} @ARGV;
-my @specs = grep {/\.(?:spec|dsc)$/} @ARGV;
+my @extradeps = grep {!/\.(?:spec|dsc|kiwi)$/} @ARGV;
+my @specs = grep {/\.(?:spec|dsc|kiwi)$/} @ARGV;
die("can only work with at most one spec\n") if @specs > 1;
my $spec = $specs[0];
@@ -211,7 +211,16 @@
$subpacks = [];
if ($spec) {
- my $d = Build::parse($cf, $spec);
+ my $d;
+ if ($spec =~ /\.kiwi$/) {
+ # just set up kiwi root for now
+ $d = {
+ 'deps' => [ 'kiwi', 'zypper', 'createrepo', 'squashfs' ],
+ 'subpacks' => [],
+ };
+ } else {
+ $d = Build::parse($cf, $spec);
+ }
$packname = $d->{'name'};
$packvers = $d->{'version'};
$subpacks = $d->{'subpacks'};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/build-2008.10.21/extractbuild
new/build-2008.11.13/extractbuild
--- old/build-2008.10.21/extractbuild 2008-10-20 17:59:15.000000000 +0200
+++ new/build-2008.11.13/extractbuild 2008-11-13 14:54:42.000000000 +0100
@@ -19,7 +19,7 @@
my $topdir = '/.build.packages';
if (-l $topdir) {
- $topdir = '/'.readlink $topdir || die "readlink: $!";
+ $topdir = '/'.readlink($topdir) || die("readlink: $!");
}
my @dirs = map {"$topdir/RPMS/$_"} ls("$topdir/RPMS");
unshift @dirs, "$topdir/SRPMS";
@@ -27,7 +27,7 @@
my @packs;
for my $dir (@dirs) {
- push @packs, map {"$dir/$_"} grep {/\.(rpm|deb)$/} ls($dir);
+ push @packs, map {"$dir/$_"} grep {-f "$dir/$_"} ls($dir);
}
#unshift @packs, '/.build.log';
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/build-2008.10.21/init_buildsystem
new/build-2008.11.13/init_buildsystem
--- old/build-2008.10.21/init_buildsystem 2008-10-20 17:59:15.000000000
+0200
+++ new/build-2008.11.13/init_buildsystem 2008-11-13 14:54:42.000000000
+0100
@@ -66,7 +66,7 @@
definesnstuff[${#definesnstuff[@]}]="$2";
shift 2
;;
- --repository)
+ --repository|--repo)
repos[${#repos[@]}]="$2";
shift 2;
;;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/build-2008.10.21/mkbaselibs
new/build-2008.11.13/mkbaselibs
--- old/build-2008.10.21/mkbaselibs 2008-10-22 00:52:27.000000000 +0200
+++ new/build-2008.11.13/mkbaselibs 2008-11-13 14:59:20.000000000 +0100
@@ -336,6 +336,10 @@
my @postun;
my $autoreqprov;
+my $verbose;
+my %target_matched;
+my @filesystem;
+
sub parse_config {
my $target = shift;
my $pkgname = shift;
@@ -408,7 +412,7 @@
my $pm = $1;
$pkgmatches = $pkgname =~ /$pm/;
$match1 = $1 if defined $1;
- $pkghasmatched |= $pkgmatches;
+ $pkghasmatched |= $pkgmatches if $pkgname =~ /-debuginfo$/ &&
$target_matched{$target};
next;
}
if (/^package\s+(.*?)$/) {
@@ -473,44 +477,8 @@
return sort keys %rpms;
}
-my $verbose;
-
-die("Usage: mkbaselibs <rpms>\n") unless @ARGV;
-
-if ($ARGV[0] eq '-v') {
- $verbose = 1;
- shift @ARGV;
-}
-while ($ARGV[0] eq '-c') {
- shift @ARGV;
- read_config($ARGV[0]);
- shift @ARGV;
-}
-
-my %goodpkgs = map {$_ => 1} get_pkgnames();
-my @rpms = @ARGV;
-for my $rpm (splice @rpms) {
- my $rpmn = $rpm;
- next if $rpm =~ /\.(no)?src\.rpm$/;
- next if $rpm =~ /\.spm$/;
- $rpmn =~ s/.*\///;
- $rpmn =~ s/-[^-]+-[^-]+\.[^\.]+\.rpm$/\.rpm/;
- $rpmn =~ s/\.rpm$//;
- push @rpms, $rpm if $goodpkgs{$rpmn};
- if ($rpmn =~ s/-debuginfo$//) {
- push @rpms, $rpm if $goodpkgs{$rpmn};
- }
-}
-for (@rpms) {
- die("$_: need absolute path to rpm\n") unless /^\//;
-}
-
-exit 0 unless @rpms;
-
-my @filesystem = split("\n", `rpm -ql filesystem 2>/dev/null`);
-die("filesystem rpm is not installed\n") unless @filesystem;
-
-for $rpm (@rpms) {
+sub handle_rpms {
+ for $rpm (@_) {
my @stags = map {uc($_)} @preamble;
push @stags, 'DESCRIPTION';
@@ -539,6 +507,7 @@
next unless parse_config($target, $res{'NAME'}->[0], $res{'VERSION'}->[0]);
die("targetname not set\n") unless $targetname;
+ $target_matched{$target} = 1;
my %ghosts;
my @rpmfiles = @{$res{'FILENAMES'}};
@@ -914,4 +883,47 @@
}
unlink($specfile);
}
+ }
}
+
+
+die("Usage: mkbaselibs <rpms>\n") unless @ARGV;
+
+if ($ARGV[0] eq '-v') {
+ $verbose = 1;
+ shift @ARGV;
+}
+while ($ARGV[0] eq '-c') {
+ shift @ARGV;
+ read_config($ARGV[0]);
+ shift @ARGV;
+}
+
+my %goodpkgs = map {$_ => 1} get_pkgnames();
+my @rpms = @ARGV;
+my @debugrpms;
+for my $rpm (splice @rpms) {
+ my $rpmn = $rpm;
+ next if $rpm =~ /\.(no)?src\.rpm$/;
+ next if $rpm =~ /\.spm$/;
+ $rpmn =~ s/.*\///;
+ $rpmn =~ s/-[^-]+-[^-]+\.[^\.]+\.rpm$/\.rpm/;
+ $rpmn =~ s/\.rpm$//;
+ push @rpms, $rpm if $goodpkgs{$rpmn};
+ if ($rpmn =~ s/-debuginfo$//) {
+ push @debugrpms, $rpm if $goodpkgs{$rpmn};
+ }
+}
+for (@rpms) {
+ die("$_: need absolute path to rpm\n") unless /^\//;
+}
+
+exit 0 unless @rpms;
+
+@filesystem = split("\n", `rpm -ql filesystem 2>/dev/null`);
+die("filesystem rpm is not installed\n") unless @filesystem;
+
+handle_rpms(@rpms);
+handle_rpms(@debugrpms);
+
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |