Hello community, here is the log from the commit of package installation-images checked in at Thu Oct 16 02:20:09 CEST 2008. -------- --- installation-images/installation-images.changes 2008-10-15 15:05:05.000000000 +0200 +++ /d/STABLE/installation-images/installation-images.changes 2008-10-16 01:32:01.965976000 +0200 @@ -1,0 +2,11 @@ +Thu Oct 16 01:31:54 CEST 2008 - ro@suse.de + +- re-enable ofed-kmp + +------------------------------------------------------------------- +Wed Oct 15 16:59:33 CEST 2008 - snwint@suse.de + +- added sntp (bnc #431516) +- initrd can have parts in fs images (bnc #430140) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- installation-images-11.26.tar.bz2 New: ---- installation-images-11.27.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.F15479/_old 2008-10-16 02:19:45.000000000 +0200 +++ /var/tmp/diff_new_pack.F15479/_new 2008-10-16 02:19:45.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package installation-images (Version 11.26) +# spec file for package installation-images (Version 11.27) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -73,7 +73,7 @@ %endif %endif %ifnarch ia64 s390 s390x -#BuildRequires: ofed-kmp-default +BuildRequires: ofed-kmp-default %endif %if %has_sles BuildRequires: yast2-theme-SLE @@ -89,9 +89,9 @@ Obsoletes: y2image AutoReqProv: off Summary: Installation Image Files -Version: 11.26 -Release: 2 -Source: installation-images-11.26.tar.bz2 +Version: 11.27 +Release: 1 +Source: installation-images-11.27.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -107,7 +107,7 @@ AutoReqProv: off Summary: Create initrd for Installation Version: 1.0 -Release: 473 +Release: 474 %description -n install-initrd You can create an initrd for installation. Useful, for example, to set @@ -171,6 +171,11 @@ /usr/sbin/mkinstallinitrd %changelog +* Thu Oct 16 2008 ro@suse.de +- re-enable ofed-kmp +* Wed Oct 15 2008 snwint@suse.de +- added sntp (bnc #431516) +- initrd can have parts in fs images (bnc #430140) * Wed Oct 15 2008 ro@suse.de - temporarily disable ofed-kmp * Tue Oct 14 2008 uli@suse.de ++++++ installation-images-11.26.tar.bz2 -> installation-images-11.27.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.26/Changelog new/installation-images-11.27/Changelog --- old/installation-images-11.26/Changelog 2008-10-14 14:41:30.000000000 +0200 +++ new/installation-images-11.27/Changelog 2008-10-15 16:58:35.000000000 +0200 @@ -1,3 +1,7 @@ +15/10/2008: v11.27 + - added sntp (bnc #431516) + - initrd can have parts in fs images (bnc #430140) + 14/10/2008: v11.26 - patch initrd offset in kernel when booting via suse.ins (bnc #432646) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.26/data/initrd/initrd.file_list new/installation-images-11.27/data/initrd/initrd.file_list --- old/installation-images-11.26/data/initrd/initrd.file_list 2008-10-14 14:37:24.000000000 +0200 +++ new/installation-images-11.27/data/initrd/initrd.file_list 2008-10-14 18:06:59.000000000 +0200 @@ -19,7 +19,7 @@ c 1777 0 0 tmp -e cp -a /dev/{null,zero,console,ram0,tty[1349]} dev +e cp -a /dev/{null,zero,console,ram0,tty[1349],loop*} dev C 4 4 /dev/tty4 # historical static device nodes x devz /devz diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.26/data/root/root.file_list new/installation-images-11.27/data/root/root.file_list --- old/installation-images-11.26/data/root/root.file_list 2008-10-14 14:37:24.000000000 +0200 +++ new/installation-images-11.27/data/root/root.file_list 2008-10-15 16:40:49.000000000 +0200 @@ -966,6 +966,7 @@ ntp: /usr/sbin/ntpdate + /usr/sbin/sntp libcap2: /lib*/libcap.so.* diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.26/gefrickel new/installation-images-11.27/gefrickel --- old/installation-images-11.26/gefrickel 1970-01-01 01:00:00.000000000 +0100 +++ new/installation-images-11.27/gefrickel 2008-10-15 16:53:55.000000000 +0200 @@ -0,0 +1,62 @@ +#! /bin/bash + +# +# move parts of initrd into squashfs images +# + +function err { + echo $1 + exit 1 +} + +function squash { + mkdir -p parts + mksquashfs $1 parts/$2 -noappend + chmod 644 parts/$2 +} + +dir=$1 + +[ -d "$dir" ] || err "$dir: not a directory" +cd $dir + +[ -d "parts" ] && { echo "$dir: already gefrickelt" ; exit 1 ; } + +# lib vs. lib64 +lib_dir=`echo lib*/libc.so.*` +lib_dir=${lib_dir%%/*} + +# - - - lib/{modules,firmware} - - - +# +# all mods ex loop & squashfs +# +m_dir=`echo lib/modules/*/initrd` +[ -d "$m_dir" ] || err "no kernel module dir" +mkdir -p "b/$m_dir" +for i in loop squashfs ; do + [ -f $m_dir/$i.ko ] && mv $m_dir/$i.ko b/$m_dir +done +mkdir -p a/lib +mv lib/modules a/lib +[ -d lib/firmware ] && mv lib/firmware a/lib +# but NOT udev +# [ -d lib/udev ] && mv lib/udev a/lib +mv b/lib/modules lib +squash a 00_lib +rm -rf a b + +# - - - usr - - - +# +# keep libs for linuxrc +# +mkdir -p "b/usr/$lib_dir" +for i in usr/$lib_dir/lib* ; do + case $i in *librpm*) continue ;; esac + mv $i b/usr/$lib_dir +done +mkdir -p a +mv usr a +mv b/usr . +squash a 01_usr +rm -rf a b + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.26/Makefile new/installation-images-11.27/Makefile --- old/installation-images-11.26/Makefile 2008-10-14 14:37:24.000000000 +0200 +++ new/installation-images-11.27/Makefile 2008-10-15 16:54:44.000000000 +0200 @@ -31,7 +31,7 @@ endif ifneq ($(filter ppc ppc64, $(ARCH)),) -ALL_TARGETS := initrd initrd+modules $(COMMON_TARGETS) sax2 +ALL_TARGETS := initrd initrd+modules+gefrickel $(COMMON_TARGETS) sax2 INSTSYS_PARTS := $(COMMON_INSTSYS_PARTS) sax2 endif @@ -90,6 +90,18 @@ ls -I module.config tmp/initrd/modules | sed -e 's#.*/##' >images/module-config/$${MOD_CFG:-default}/module.list cp tmp/initrd/modules/module.config images/module-config/$${MOD_CFG:-default} +initrd+modules+gefrickel: base + image=modules-config src=initrd fs=none bin/mk_image + bin/mlist1 + bin/mlist2 + rm -rf tmp/initrd/modules tmp/initrd/lib/modules + mode=keep,add image=$${image:-initrd} tmpdir=initrd filelist=modules src=initrd fs=none bin/mk_image + mkdir -p images/module-config/$${MOD_CFG:-default} + ls -I module.config tmp/initrd/modules | sed -e 's#.*/##' >images/module-config/$${MOD_CFG:-default}/module.list + cp tmp/initrd/modules/module.config images/module-config/$${MOD_CFG:-default} + ./gefrickel tmp/initrd + mode=keep image=$${image:-initrd} tmpdir=initrd src=initrd filelist=initrd fs=cpio.gz bin/mk_image + kernel: base image=vmlinuz-$${MOD_CFG:-default} src=initrd filelist=kernel kernel=kernel-$${MOD_CFG:-default} fs=dir bin/mk_image Files old/installation-images-11.26/src/gkv/gkv and new/installation-images-11.27/src/gkv/gkv differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/installation-images-11.26/VERSION new/installation-images-11.27/VERSION --- old/installation-images-11.26/VERSION 2008-10-14 14:41:33.000000000 +0200 +++ new/installation-images-11.27/VERSION 2008-10-15 16:58:04.000000000 +0200 @@ -1 +1 @@ -11.26 +11.27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de