Mailinglist Archive: opensuse-commit (1082 mails)
| < Previous | Next > |
commit kiwi
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 22 May 2007 17:12:25 +0200
- Message-id: <20070522151226.013BB678171@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package kiwi
checked in at Tue May 22 17:12:25 CEST 2007.
--------
--- arch/i386/kiwi/kiwi.changes 2007-05-21 17:17:52.000000000 +0200
+++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2007-05-22 17:05:35.368309000 +0200
@@ -1,0 +2,7 @@
+Tue May 22 15:27:10 CEST 2007 - ms@xxxxxxx
+
+- v1.35
+- fixed creating kernel link
+- added check for autobuild environment
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.k30946/_old 2007-05-22 17:11:30.000000000 +0200
+++ /var/tmp/diff_new_pack.k30946/_new 2007-05-22 17:11:30.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kiwi (Version 1.34)
+# spec file for package kiwi (Version 1.35)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -15,7 +15,7 @@
BuildRequires: module-init-tools perl perl-XML-LibXML perl-libwww-perl screen smart syslinux
Requires: perl perl-XML-LibXML perl-libwww-perl screen
Summary: OpenSuSE - KIWI Image System
-Version: 1.34
+Version: 1.35
Release: 1
Group: System/Management
License: GNU General Public License (GPL)
@@ -138,12 +138,13 @@
# %patch
%build
-export K_USER=0 # set value to 0 to build boot images
+export K_USER=0 # set value to -1 to prevent building boot images
rm -rf $RPM_BUILD_ROOT
+test -e /.buildenv || export K_USER=-1 # no buildenv, no boot image build
test -e /.buildenv && . /.buildenv
#cat /proc/mounts > /etc/fstab
make buildroot=$RPM_BUILD_ROOT CFLAGS="$RPM_OPT_FLAGS"
-if [ $UID = $K_USER ];then
+if [ "$UID" = "$K_USER" ];then
# prepare and create boot images...
mkdir -p $RPM_BUILD_ROOT/srv/tftpboot/pxelinux.cfg
mkdir -p $RPM_BUILD_ROOT/srv/tftpboot/boot
@@ -205,6 +206,7 @@
)
done
rm -f $RPM_BUILD_ROOT/srv/tftpboot/boot/*.md5
+ rm -f $RPM_BUILD_ROOT/srv/tftpboot/boot/*.kernel
else
echo "cannot build prebuild images without root privileges"
true
@@ -219,7 +221,7 @@
man_prefix=$RPM_BUILD_ROOT/%{_mandir} \
install
touch kiwi.loader
-if [ ! $UID = $K_USER ];then
+if [ ! "$UID" = "$K_USER" ];then
install -m 755 pxeboot/pxelinux.0.config \
$RPM_BUILD_ROOT/srv/tftpboot/pxelinux.cfg/default
fi
@@ -285,6 +287,10 @@
%{_datadir}/kiwi/image/xenboot
%changelog
+* Tue May 22 2007 - ms@xxxxxxx
+- v1.35
+- fixed creating kernel link
+- added check for autobuild environment
* Mon May 14 2007 - ms@xxxxxxx
- v1.34
- code cleanup: reduce amount of package variables. Move module
++++++ kiwi.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/doc/activate.tex new/kiwi/doc/activate.tex
--- old/kiwi/doc/activate.tex 2007-04-25 12:34:52.000000000 +0200
+++ new/kiwi/doc/activate.tex 2007-05-22 10:22:18.000000000 +0200
@@ -358,6 +358,13 @@
are part of the read/write filesystem. Please note the device
specifications in UNIONFS\_CONFIG must correspond with
the partition information in PART.
+ \item \textbf{KIWI\_KERNEL\_OPTIONS}\\
+ Specifies additional command line options to be passed to
+ the kernel when booting from disk. For instance, to enable
+ a splash screen, you might use 'vga=0x317 splash=silent'.
+ \item \textbf{KIWI\_BOOT\_TIMEOUT}\\
+ Specifies the number of seconds to wait at the grub boot
+ screen when doing a local boot. The default is 10.
\end{itemize}
%\newpage
Files old/kiwi/doc/kiwi.pdf and new/kiwi/doc/kiwi.pdf differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/kiwi.pl new/kiwi/kiwi.pl
--- old/kiwi/kiwi.pl 2007-05-21 14:41:52.000000000 +0200
+++ new/kiwi/kiwi.pl 2007-05-22 15:43:38.000000000 +0200
@@ -30,7 +30,7 @@
#============================================
# Globals (Version)
#--------------------------------------------
-our $Version = "1.34";
+our $Version = "1.35";
our $SchemeVersion = "1.3";
#============================================
# Globals
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/modules/KIWIImage.pm new/kiwi/modules/KIWIImage.pm
--- old/kiwi/modules/KIWIImage.pm 2007-05-21 17:00:34.000000000 +0200
+++ new/kiwi/modules/KIWIImage.pm 2007-05-22 15:43:38.000000000 +0200
@@ -764,7 +764,7 @@
my $destination = "$main::RootTree/CD/boot/$isoarch/loader";
qx (mkdir -p $destination);
qx (cp $imageDest/$iso*$arch*.gz $destination/initrd);
- qx (cp $imageDest/$iso*$arch*.kernel* $destination/linux);
+ qx (cp $imageDest/$iso*$arch*.kernel $destination/linux);
$kiwi -> done ();
#==========================================
@@ -1589,6 +1589,7 @@
my $file = "$imageDest/$name.kernel";
my $lx = '"^Linux version"';
my $sp = '-f3 -d" "';
+ qx (rm -f $file);
qx (cp $imageTree/boot/vmlinuz $file);
my $code = $? >> 8;
if ($code != 0) {
@@ -1610,6 +1611,7 @@
}
my $kernel = qx (gzip -dc $gzfile | strings | grep $lx | cut $sp);
chomp $kernel;
+ qx (rm -f $file.$kernel);
qx (mv $file $file.$kernel && ln -s $file.$kernel $file );
if (-f "$imageTree/boot/xen.gz") {
$file = "$imageDest/$name.kernel-xen";
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |