Hello community,
here is the log from the commit of package installation-images for
openSUSE:Factory checked in at 2013-09-02 14:52:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images (Old)
and /work/SRC/openSUSE:Factory/.installation-images.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images"
Changes:
--------
--- /work/SRC/openSUSE:Factory/installation-images/installation-images.changes
2013-08-29 07:05:11.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes
2013-09-02 14:52:10.000000000 +0200
@@ -1,0 +2,12 @@
+Mon Sep 2 14:45:34 CEST 2013 - [email protected]
+
+- samba package changes
+- On non intel architectures biosdevname doesn't exist.
+
+-------------------------------------------------------------------
+Fri Aug 30 11:43:12 CEST 2013 - [email protected]
+
+- avoid /usr/src/packages else linuxrc thinks it's in test mode
+- ppc64: use classic initrd and linux, we use yaboot anyway for netboot now
+
+-------------------------------------------------------------------
Old:
----
installation-images-14.11.tar.bz2
New:
----
installation-images-14.13.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.5ePyO5/_old 2013-09-02 14:52:12.000000000 +0200
+++ /var/tmp/diff_new_pack.5ePyO5/_new 2013-09-02 14:52:12.000000000 +0200
@@ -382,9 +382,9 @@
Summary: Installation Image Files
License: GPL-2.0+
Group: Metapackages
-Version: 14.11
+Version: 14.13
Release: 0
-Source: installation-images-14.11.tar.bz2
+Source: installation-images-14.13.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _binary_payload w.ufdio
++++++ installation-images-14.11.tar.bz2 -> installation-images-14.13.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.11/VERSION
new/installation-images-14.13/VERSION
--- old/installation-images-14.11/VERSION 2013-08-27 16:36:03.000000000
+0200
+++ new/installation-images-14.13/VERSION 2013-09-02 14:45:30.000000000
+0200
@@ -1 +1 @@
-14.11
+14.13
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.11/bin/mk_ppc_installation-images_bootbinaries.sh
new/installation-images-14.13/bin/mk_ppc_installation-images_bootbinaries.sh
---
old/installation-images-14.11/bin/mk_ppc_installation-images_bootbinaries.sh
2013-08-09 16:06:04.000000000 +0200
+++
new/installation-images-14.13/bin/mk_ppc_installation-images_bootbinaries.sh
2013-08-30 11:15:21.000000000 +0200
@@ -50,60 +50,62 @@
gzip -fcv9 /boot/vmlinux-*-default > $CD1/suseboot/linux64.gz
fi
-if [ -f /lib/lilo/chrp/mkzimage_cmdline ] ; then
- mkdir -pv $CD1/ppc/netboot
- cp -Lpfv /lib/lilo/chrp/mkzimage_cmdline $CD1/ppc/netboot
- chmod 0755 $CD1/ppc/netboot/mkzimage_cmdline
-fi
-#
-if test "$do_64" = "true" ; then
- /bin/mkzimage \
- --board chrp \
- --vmlinux /boot/vmlinux-*-default \
- --initrd $bdir/initrd-default \
- --output $CD1/suseboot/inst64
-#
- if test "42" = "false" ; then
- /bin/mkzimage \
- --board iseries \
- --vmlinux /boot/vmlinux-*-default \
- --initrd $bdir/initrd-default \
- --output $CD1/ISERIES64
- fi
-#
-fi
-#
-if test "$do_32" = "true" ; then
- /bin/mkzimage \
- --board chrp \
- --vmlinux /boot/vmlinux-*-default \
- --initrd $bdir/initrd \
- --output $CD1/suseboot/inst32
-#
- if test "42" = "false" ; then
- /bin/mkzimage \
- --board prep \
- --vmlinux /boot/vmlinux-*-default \
- --initrd $bdir/initrd \
- --cmdline 'sysrq=1 nosshkey minmemory=0 MemYaSTText=0 quiet ' \
- --output $CD1/boot/ppc/zImage.prep.initrd
- fi
-#
- if test "42" = "false" ; then
- /bin/mkzimage \
- --board pmaccoff \
- --vmlinux /boot/vmlinux-*-default \
- --initrd $bdir/initrd-ppc32_pmac_coff \
- --output $CD1/boot/ppc/install-pmaccoff
-#
- /bin/mkzimage \
- --board pmaccoff \
- --vmlinux /boot/vmlinux-*-default \
- --output $CD1/boot/ppc/vmlinux-pmaccoff
+#deprecate inst{32,64}. We use yaboot anyway, it doens't make sense
+#to embed yaboot
+#if [ -f /lib/lilo/chrp/mkzimage_cmdline ] ; then
+# mkdir -pv $CD1/ppc/netboot
+# cp -Lpfv /lib/lilo/chrp/mkzimage_cmdline $CD1/ppc/netboot
+# chmod 0755 $CD1/ppc/netboot/mkzimage_cmdline
+#fi
+#
+#if test "$do_64" = "true" ; then
+# /bin/mkzimage \
+# --board chrp \
+# --vmlinux /boot/vmlinux-*-default \
+# --initrd $bdir/initrd-default \
+# --output $CD1/suseboot/inst64
+#
+# if test "42" = "false" ; then
+# /bin/mkzimage \
+# --board iseries \
+# --vmlinux /boot/vmlinux-*-default \
+# --initrd $bdir/initrd-default \
+# --output $CD1/ISERIES64
+# fi
+#
+#fi
+#
+#if test "$do_32" = "true" ; then
+# /bin/mkzimage \
+# --board chrp \
+# --vmlinux /boot/vmlinux-*-default \
+# --initrd $bdir/initrd \
+# --output $CD1/suseboot/inst32
+#
+# if test "42" = "false" ; then
+# /bin/mkzimage \
+# --board prep \
+# --vmlinux /boot/vmlinux-*-default \
+# --initrd $bdir/initrd \
+# --cmdline 'sysrq=1 nosshkey minmemory=0 MemYaSTText=0 quiet ' \
+# --output $CD1/boot/ppc/zImage.prep.initrd
+# fi
+#
+# if test "42" = "false" ; then
+# /bin/mkzimage \
+# --board pmaccoff \
+# --vmlinux /boot/vmlinux-*-default \
+# --initrd $bdir/initrd-ppc32_pmac_coff \
+# --output $CD1/boot/ppc/install-pmaccoff
+##
+# /bin/mkzimage \
+# --board pmaccoff \
+# --vmlinux /boot/vmlinux-*-default \
+# --output $CD1/boot/ppc/vmlinux-pmaccoff
#
- fi
+# fi
#
-fi
+#fi
#
we_dont_smoke_that_stuff=`echo ${BUILD_DISTRIBUTION_NAME} | sed -e
's@SUSE@SuSE@;s@LINUX@Linux@'`
#
@@ -144,13 +146,16 @@
do
cat >> $CD1/suseboot/yaboot.cnf <<EOF
-image[${i}bit]=inst${i}
+image[${i}bit]=linux${i}.gz
+ initrd=initrd${i}
label=install
append="quiet sysrq=1 insmod=sym53c8xx insmod=ipr "
-image[${i}bit]=inst${i}
+image[${i}bit]=linux${i}.gz
+ initrd=initrd${i}
label=slp
append="quiet sysrq=1 install=slp "
-image[${i}bit]=inst${i}
+image[${i}bit]=linux${i}.gz
+ initrd=initrd${i}
label=rescue
append="quiet sysrq=1 rescue=1 "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.11/changelog
new/installation-images-14.13/changelog
--- old/installation-images-14.11/changelog 2013-08-27 16:36:06.000000000
+0200
+++ new/installation-images-14.13/changelog 2013-09-02 14:45:32.000000000
+0200
@@ -1,4 +1,15 @@
-2013-08-27: HEAD
+2013-09-02: HEAD
+ - samba package changes
+ - Merge pull request #1 from k0da/master
+ - Add biosdevname if available
+ - Add biosdevname if available
+ - On non intel architectures biosdevname doesn't exist.
+
+2013-08-30: 14.12
+ - avoid /usr/src/packages else linuxrc thinks it's in test mode
+ - Use clasic initrd and linux. We use yaboot anyway for netboot now.
+
+2013-08-27: 14.11
- convert root image - part 2
- add biosdevname (bnc #810478)
- packages we ignore need not exist
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.11/data/initrd/initrd.file_list
new/installation-images-14.13/data/initrd/initrd.file_list
--- old/installation-images-14.11/data/initrd/initrd.file_list 2013-08-27
11:01:23.000000000 +0200
+++ new/installation-images-14.13/data/initrd/initrd.file_list 2013-09-02
12:12:25.000000000 +0200
@@ -91,7 +91,11 @@
terminfo-base: ignore
update-alternatives: ignore
-biosdevname:
+samba-libs: nodeps
+ /usr/lib*/samba/libreplace.so
+ /usr/lib*/samba/libwinbind-client.so
+
+?biosdevname:
cpio:
curl:
device-mapper:
@@ -450,8 +454,8 @@
:
-# remove, ehm, things...
-r /usr/share/doc /usr/share/info /usr/share/man /usr/share/locale
/var/adm/fillup-templates
+# remove files we don't want to show up at all
+r /usr/share/{doc,info,locale,man} /usr/src/packages /var/adm/fillup-templates
# historical static device nodes
x devz /devz
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/installation-images-14.11/data/rescue/rescue.file_list
new/installation-images-14.13/data/rescue/rescue.file_list
--- old/installation-images-14.11/data/rescue/rescue.file_list 2013-08-27
15:41:28.000000000 +0200
+++ new/installation-images-14.13/data/rescue/rescue.file_list 2013-09-02
13:48:45.000000000 +0200
@@ -114,7 +114,6 @@
procps:
psmisc:
reiserfs:
-rpm:
rsh:
sdparm:
sed:
@@ -140,6 +139,18 @@
xfsprogs:
xz:
+samba-libs: nodeps
+ /usr/lib*/samba/libreplace.so
+ /usr/lib*/samba/libwinbind-client.so
+
+rpm:
+ /bin
+ /usr/bin
+ /{usr,var}/lib/rpm
+ /usr/lib*/librpm*.so.*
+r /usr/lib/rpm/rpm{get,put}text
+r /usr/bin/rpmqpack
+
gawk:
/usr/bin/gawk
s gawk usr/bin/awk
@@ -280,9 +291,8 @@
# create it now (see filesystem package above)
d /sys
-# remove, ehm, things...
-r /usr/share/doc /usr/share/info /usr/share/man /usr/share/locale
/var/adm/fillup-templates
-# r /run/*
+# remove files we don't want to show up at all
+r /usr/share/{doc,info,locale,man} /usr/src/packages /var/adm/fillup-templates
# we better have one...
e touch etc/sysconfig/kernel
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.11/data/root/root.file_list
new/installation-images-14.13/data/root/root.file_list
--- old/installation-images-14.11/data/root/root.file_list 2013-08-27
15:08:12.000000000 +0200
+++ new/installation-images-14.13/data/root/root.file_list 2013-08-30
11:34:03.000000000 +0200
@@ -126,7 +126,6 @@
procps:
psmisc:
reiserfs:
-rpm:
screen:
sed:
sg3_utils:
@@ -174,6 +173,13 @@
# rubygem-nokogiri:
+rpm:
+ /bin
+ /etc
+ /usr/bin
+ /usr/lib*
+ r /usr/lib*/rpm-plugins/sepolicy.so
+
gawk:
/usr/bin/gawk
s gawk usr/bin/awk
@@ -628,8 +634,8 @@
e mkfontscale usr/share/fonts/truetype
e mkfontdir usr/share/fonts/truetype
-# remove, ehm, things...
-r /usr/share/doc /usr/share/info /usr/share/man /var/adm/fillup-templates
+# remove files we don't want to show up at all
+r /usr/share/{doc,info,man} /usr/src/packages /var/adm/fillup-templates
# don't mess with mtab (from aaa_base postin ATM)
r etc/mtab
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
