Hi,

There's a large number of build VM bringup failures in Trunk on ARM side and
I've traced it to be the difference between the two project's prjconf.

Would it be possible to get those prjconf's synchronised (ie, T:T's config
into Trunk) so the projects are more equal. T:T seems the more stable one
right now.

Differences in prjconf are: (t.1 is Trunk, t.2 is Trunk:Testing)

--- t.1 2011-07-28 06:52:45.535329996 +0200
+++ t.2 2011-07-28 06:56:13.310850931 +0200
@@ -33,7 +33,7 @@
 #
 %ifarch %arm
 # arm land
-
+Ignore: rpm-build:xz
 %define cross_5 1
 %define cross_7 1
 %define native 1
@@ -209,44 +209,34 @@
 Preinstall: libgcc pam  nss nspr libcap
 Preinstall: popt readline sed tar zlib sqlite  ncurses-libs
 Preinstall: elfutils-libelf bzip2-libs libstdc++ setup file-libs
-Preinstall: nss-softokn-freebl
+Preinstall: nss-softokn-freebl
 Preinstall: xz-libs

-
 #Runscripts: setup
-
-%ifarch %arm
-VMinstall:  perl e2fsprogs-libs perl-libs grep pcre btrfs-progs
-%else
 VMinstall: util-linux perl libblkid e2fsprogs-libs libuuid perl-libs grep
pcre btrfs-progs
-%endif
-
 Required: binutils gcc glibc rpm-build libtool

 Support: cpio gcc-c++ perl-libs perl  net-tools findutils
-Support: file findutils zlib bzip2 info
-Support: gzip ncurses-libs xz-lzma-compat
+Support: file findutils zlib bzip2
+Support: gzip ncurses-libs
 Support: make  patch sed  gawk tar grep coreutils pkgconfig  autoconf
automake
 Support: unzip  groff shadow-utils
-Support: m4 file-libs tzdata meego-release
+Support: m4 file-libs tzdata meego-rpm-config meego-release
 Support: kernel-headers glibc-headers
-Support: meego-rpm-config
-Support: util-linux
+Support: systemd util-linux
+Support: xz-lzma-compat

-Keep: binutils cpp  cracklib file findutils gawk gcc  gcc-ada gcc-c++
-Keep: gdbm  gzip libada libunwind  glibc-devel pcre
+Keep: binutils cpp  file findutils gawk gcc  gcc-c++
+Keep: gdbm  gzip libada libunwind  glibc-devel pcre xz-lzma-compat
 Keep: make pam-modules shadow-utils gmp libcap groff cpio
-Keep: patch rcs rpm-build  nss nspr elfutils python grep libgcc gcc-c++
+Keep: patch rpm-build  nss nspr elfutils python grep libgcc gcc-c++
 Keep:  kernel-headers glibc-headers perl-libs
-Keep: meego-rpm-config
-
+Keep: pkgconfig glib2 meego-rpm-config
+Keep: xz-lzma-compat
 Keep: mpc mpfr
-%ifarch %ix86
 Keep: cloog cloog-ppl ppl
-%endif


-Prefer: util-linux
 Prefer: xorg-x11-server-Xorg
 Prefer: libtool-ltdl
 Prefer: db4-cxx
@@ -255,20 +245,16 @@
 Prefer: perl-Archive-Tar
 Prefer: mesa-dri-i965-driver

-
 Prefer: generic-logos

-FileProvides: /usr/sbin/alternatives chkconfig
-#FileProvides: liblzma.so.0 xz0
-FileProvides: /sbin/chkconfig chkconfig
+FileProvides: /bin/systemctl systemd

 # Build dependency cycle
-Ignore: glade3-libgladeui-devel:devhelp
+Ignore: rpm-build:xz
 Ignore: udev:udev-rules
 Ignore: xdg-utils:libcontentaction
 Ignore: cups:xinetd
-Ignore: libmeegotouch:libmeegotouch-theme
-Ignore: texlive:libmeegotouch
+Ignore: cups:xinitd
 Ignore: alsa-lib:alsa-plugins-pulseaudio
 Ignore: meego-cross-armv5tel-sysroot
 Ignore: nautilus:gvfs
@@ -322,7 +308,6 @@
 Ignore: tetex:tetex-fonts,desktop-file-utils
 Ignore: pam:glib2

-Ignore: util-linux:ConsoleKit-libs
 Ignore: gettext-devel:libgcj,libstdc++-devel
 Ignore: pam-modules:resmgr
 Ignore: bind-utils:bind-libs
carsten@ideapad:~$ diff -u t.1 t.2
--- t.1 2011-07-28 06:52:45.535329996 +0200
+++ t.2 2011-07-28 06:56:13.310850931 +0200
@@ -33,7 +33,7 @@
 #
 %ifarch %arm
 # arm land
-
+Ignore: rpm-build:xz
 %define cross_5 1
 %define cross_7 1
 %define native 1
@@ -209,44 +209,34 @@
 Preinstall: libgcc pam  nss nspr libcap
 Preinstall: popt readline sed tar zlib sqlite  ncurses-libs
 Preinstall: elfutils-libelf bzip2-libs libstdc++ setup file-libs
-Preinstall: nss-softokn-freebl
+Preinstall: nss-softokn-freebl
 Preinstall: xz-libs

-
 #Runscripts: setup
-
-%ifarch %arm
-VMinstall:  perl e2fsprogs-libs perl-libs grep pcre btrfs-progs
-%else
 VMinstall: util-linux perl libblkid e2fsprogs-libs libuuid perl-libs grep
pcre btrfs-progs
-%endif
-
 Required: binutils gcc glibc rpm-build libtool

 Support: cpio gcc-c++ perl-libs perl  net-tools findutils
-Support: file findutils zlib bzip2 info
-Support: gzip ncurses-libs xz-lzma-compat
+Support: file findutils zlib bzip2
+Support: gzip ncurses-libs
 Support: make  patch sed  gawk tar grep coreutils pkgconfig  autoconf
automake
 Support: unzip  groff shadow-utils
-Support: m4 file-libs tzdata meego-release
+Support: m4 file-libs tzdata meego-rpm-config meego-release
 Support: kernel-headers glibc-headers
-Support: meego-rpm-config
-Support: util-linux
+Support: systemd util-linux
+Support: xz-lzma-compat

-Keep: binutils cpp  cracklib file findutils gawk gcc  gcc-ada gcc-c++
-Keep: gdbm  gzip libada libunwind  glibc-devel pcre
+Keep: binutils cpp  file findutils gawk gcc  gcc-c++
+Keep: gdbm  gzip libada libunwind  glibc-devel pcre xz-lzma-compat
 Keep: make pam-modules shadow-utils gmp libcap groff cpio
-Keep: patch rcs rpm-build  nss nspr elfutils python grep libgcc gcc-c++
+Keep: patch rpm-build  nss nspr elfutils python grep libgcc gcc-c++
 Keep:  kernel-headers glibc-headers perl-libs
-Keep: meego-rpm-config
-
+Keep: pkgconfig glib2 meego-rpm-config
+Keep: xz-lzma-compat
 Keep: mpc mpfr
-%ifarch %ix86
 Keep: cloog cloog-ppl ppl
-%endif


-Prefer: util-linux
 Prefer: xorg-x11-server-Xorg
 Prefer: libtool-ltdl
 Prefer: db4-cxx
@@ -255,20 +245,16 @@
 Prefer: perl-Archive-Tar
 Prefer: mesa-dri-i965-driver

-
 Prefer: generic-logos

-FileProvides: /usr/sbin/alternatives chkconfig
-#FileProvides: liblzma.so.0 xz0
-FileProvides: /sbin/chkconfig chkconfig
+FileProvides: /bin/systemctl systemd

 # Build dependency cycle
-Ignore: glade3-libgladeui-devel:devhelp
+Ignore: rpm-build:xz
 Ignore: udev:udev-rules
 Ignore: xdg-utils:libcontentaction
 Ignore: cups:xinetd
-Ignore: libmeegotouch:libmeegotouch-theme
-Ignore: texlive:libmeegotouch
+Ignore: cups:xinitd
 Ignore: alsa-lib:alsa-plugins-pulseaudio
 Ignore: meego-cross-armv5tel-sysroot
 Ignore: nautilus:gvfs
@@ -322,7 +308,6 @@
 Ignore: tetex:tetex-fonts,desktop-file-utils
 Ignore: pam:glib2

-Ignore: util-linux:ConsoleKit-libs
 Ignore: gettext-devel:libgcj,libstdc++-devel
 Ignore: pam-modules:resmgr
 Ignore: bind-utils:bind-libs

BR
Carsten Munk
_______________________________________________
MeeGo-packaging mailing list
[email protected]
http://lists.meego.com/listinfo/meego-packaging

Reply via email to