Hello community,
here is the log from the commit of package installation-images for
openSUSE:Factory checked in at 2014-02-01 08:43:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2014-01-30 06:54:07.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.installation-images.new/installation-images.changes
2014-02-01 08:43:25.000000000 +0100
@@ -1,0 +2,14 @@
+Fri Jan 31 13:55:24 CET 2014 - [email protected]
+
+- no longer ignore certain yast2 packages
+
+-------------------------------------------------------------------
+Thu Jan 30 13:08:55 CET 2014 - [email protected]
+
+- use skelcd-control-* for yast package list
+- Merge pull request #8 from lslezak/yast_deps_and_branding
+- there can be different packages in SLES and openSUSE inst-sys
+- make some branding packages optional (SLE branding has a different
+ package set than openSUSE)
+
+-------------------------------------------------------------------
Old:
----
installation-images-14.33.tar.bz2
New:
----
installation-images-14.35.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.K6CrGU/_old 2014-02-01 08:43:26.000000000 +0100
+++ /var/tmp/diff_new_pack.K6CrGU/_new 2014-02-01 08:43:26.000000000 +0100
@@ -35,7 +35,6 @@
BuildRequires: alsa
BuildRequires: alsa-utils
BuildRequires: audit-libs
-BuildRequires: autoyast2-installation
BuildRequires: bc
BuildRequires: bind-libs
BuildRequires: bind-utils
@@ -166,8 +165,6 @@
BuildRequires: systemd-presets-branding-openSUSE
BuildRequires: tunctl
BuildRequires: udev
-BuildRequires: yast2-fcoe-client
-BuildRequires: yast2-ruby-bindings
%if %with_plymouth
BuildRequires: libkms1
BuildRequires: plymouth
@@ -236,27 +233,15 @@
BuildRequires: xset
BuildRequires: xterm
BuildRequires: xz
-BuildRequires: yast2-add-on
-BuildRequires: yast2-buildtools
BuildRequires: yast2-devtools
-BuildRequires: yast2-iscsi-client
-BuildRequires: yast2-kdump
-BuildRequires: yast2-ldap-client
-BuildRequires: yast2-multipath
-BuildRequires: yast2-network
-BuildRequires: yast2-nfs-client
-BuildRequires: yast2-ntp-client
-BuildRequires: yast2-pam
-BuildRequires: yast2-proxy
-BuildRequires: yast2-security
-BuildRequires: yast2-services-manager
-BuildRequires: yast2-slp
-BuildRequires: yast2-trans-allpacks
-BuildRequires: yast2-trans-stats
-BuildRequires: yast2-tune
-BuildRequires: yast2-update
-BuildRequires: yast2-users
-BuildRequires: yast2-x11
+
+%if %with_sles
+# used also for SLED
+BuildRequires: skelcd-control-SLES
+%else
+BuildRequires: skelcd-control-openSUSE
+BuildRequires: yast2-qt-branding-openSUSE
+%endif
%if %{with sbl}
BuildRequires: sbl
%endif
@@ -327,7 +312,6 @@
BuildRequires: virtualbox-guest-kmp-default
BuildRequires: virtualbox-guest-x11
%endif
-BuildRequires: yast2-vm
%endif
%ifarch %ix86
BuildRequires: dos2unix
@@ -353,17 +337,16 @@
%endif
%ifarch s390 s390x
BuildRequires: kernel-installation-tapeipl
-BuildRequires: yast2-reipl
%endif
%ifarch s390x
BuildRequires: glibc-32bit
%endif
-BuildRequires: yast2-qt-branding-openSUSE
%ifarch %ix86 x86_64
-BuildRequires: gfxboot-branding-openSUSE
%if %with_sles
-BuildRequires: gfxboot-branding-SLED
+# BuildRequires: gfxboot-branding-SLED
BuildRequires: gfxboot-branding-SLES
+%else
+BuildRequires: gfxboot-branding-openSUSE
%endif
%if %with_efi_graphics
BuildRequires: grub2-branding-openSUSE
@@ -375,14 +358,8 @@
%ifarch %ix86 x86_64 ia64
#BuildRequires: brocade-bfa-kmp-default
%endif
-%if %with_sles
-BuildRequires: yast2-theme-SLE
-%endif
BuildRequires: desktop-data-openSUSE
BuildRequires: dmz-icon-theme-cursors
-BuildRequires: yast2-theme-openSUSE
-BuildRequires: yast2-theme-openSUSE-Oxygen
-#
Provides: y2image
Obsoletes: y2image
AutoReqProv: off
@@ -390,9 +367,9 @@
Summary: Installation Image Files
License: GPL-2.0+
Group: Metapackages
-Version: 14.33
+Version: 14.35
Release: 0
-Source: installation-images-14.33.tar.bz2
+Source: installation-images-14.35.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _binary_payload w.ufdio
@@ -481,7 +458,7 @@
# beta only: ignore non-critical errors
# export debug=ignore
%if %with_sles
-make
+make THEMES=SLES
%else
make THEMES=openSUSE
%endif
@@ -489,7 +466,7 @@
%if %with_xen
# build xen initrd & kernel
%if %with_sles
-image=initrd-xen kernel=kernel-xen MOD_CFG=xen make initrd+modules
+image=initrd-xen kernel=kernel-xen MOD_CFG=xen make initrd+modules THEMES=SLES
%else
image=initrd-xen kernel=kernel-xen MOD_CFG=xen make initrd+modules
THEMES=openSUSE
%endif
@@ -498,14 +475,14 @@
%endif
%ifarch ppc ppc64
%if %with_sles
-image=initrd-default kernel=kernel-default MOD_CFG=ppc64 make
initrd+modules+gefrickel
+image=initrd-default kernel=kernel-default MOD_CFG=ppc64 make
initrd+modules+gefrickel THEMES=SLES
%else
image=initrd-default kernel=kernel-default MOD_CFG=ppc64 make
initrd+modules+gefrickel THEMES=openSUSE
%endif
%endif
%ifarch ppc64le
%if %with_sles
-image=initrd-default kernel=kernel-default MOD_CFG=ppc64le make
initrd+modules+gefrickel
+image=initrd-default kernel=kernel-default MOD_CFG=ppc64le make
initrd+modules+gefrickel THEMES=SLES
%else
image=initrd-default kernel=kernel-default MOD_CFG=ppc64le make
initrd+modules+gefrickel THEMES=openSUSE
%endif
@@ -516,13 +493,13 @@
export BUILD_DISTRIBUTION_NAME
test ! -z "$BUILD_DISTRIBUTION_NAME"
%if %with_sles
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} THEMES=SLES
%else
make install DESTDIR=%{buildroot} THEMES=openSUSE
%endif
# make debuginfo DESTDIR=%{buildroot}
%if %with_sles
-make install-initrd DESTDIR=%{buildroot}/usr/lib/install-initrd
+make install-initrd DESTDIR=%{buildroot}/usr/lib/install-initrd THEMES=SLES
%else
make install-initrd DESTDIR=%{buildroot}/usr/lib/install-initrd THEMES=openSUSE
%endif
++++++ installation-images-14.33.tar.bz2 -> installation-images-14.35.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.33/VERSION
new/installation-images-14.35/VERSION
--- old/installation-images-14.33/VERSION 2014-01-29 15:49:09.000000000
+0100
+++ new/installation-images-14.35/VERSION 2014-01-31 13:55:16.000000000
+0100
@@ -1 +1 @@
-14.33
+14.35
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.33/changelog
new/installation-images-14.35/changelog
--- old/installation-images-14.33/changelog 2014-01-29 15:49:13.000000000
+0100
+++ new/installation-images-14.35/changelog 2014-01-31 13:55:20.000000000
+0100
@@ -1,4 +1,16 @@
-2014-01-29: HEAD
+2014-01-31: HEAD
+ - no longer ignore certain yast2 packages
+
+2014-01-30: 14.34
+ - use skelcd-control-* for yast package list
+ - Merge pull request #8 from lslezak/yast_deps_and_branding
+ - install Yast packages via dependencies
+ - install Yast packages via dependencies
+ - there can be different packages in SLES and openSUSE inst-sys
+ - make some branding packages optional (SLE branding has a different
+ package set than openSUSE)
+
+2014-01-29: 14.33
- build rescue-server
2014-01-28: 14.32
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.33/data/root/root.file_list
new/installation-images-14.35/data/root/root.file_list
--- old/installation-images-14.33/data/root/root.file_list 2014-01-27
12:04:14.000000000 +0100
+++ new/installation-images-14.35/data/root/root.file_list 2014-01-31
13:44:13.000000000 +0100
@@ -28,6 +28,10 @@
/usr/*/ruby/gems/*/gems/*/lib
/usr/*/ruby/gems/*/specifications
+TEMPLATE skelcd-control-.*:
+ # just a template that does nothing
+ d .
+
TEMPLATE:
/
@@ -58,28 +62,21 @@
update-alternatives: ignore
xinetd: ignore
xrdb: ignore
-yast2-ldap-client: ignore
-yast2-python-bindings: ignore
icewm: ignore
pkg-config: ignore
syslog-service: ignore
kmod: ignore
gio-branding-upstream: ignore
hicolor-icon-theme: ignore
-yast2-nfs-common: ignore
-yast2-pam: ignore
-yast2-security: ignore
+yast2-trans-allpacks: ignore
udev: ignore
unzip: ignore
?dracut: ignore
?mkinitrd: ignore
+?yast2-theme-openSUSE-Oxygen: ignore
?efibootmgr:
?elilo:
-?yast2-reipl:
-?yast2-s390:
-?yast2-vm:
-autoyast2-installation:
btrfsprogs:
bzip2:
coreutils:
@@ -148,43 +145,11 @@
xfsdump:
xfsprogs:
xz:
-yast2-add-on:
-yast2-bootloader:
-yast2-core:
-yast2-country-data:
-yast2-country:
-yast2-fcoe-client:
-##
-yast2-hardware-detection:
-yast2-iscsi-client:
-yast2-kdump:
-yast2-ldap-client:
-yast2-multipath:
-yast2-network:
-yast2-nfs-client:
-yast2-ntp-client:
-yast2-packager:
-yast2-pam:
-yast2-perl-bindings:
-yast2-pkg-bindings:
-yast2-proxy:
-yast2-ruby-bindings:
-yast2-security:
-yast2-services-manager:
-##
-yast2-slp:
-yast2-trans-stats:
-##
-yast2-transfer:
-yast2-tune:
-yast2-update:
-yast2-users:
-yast2-x11:
-##
-yast2-xml:
-yast2-ycp-ui-bindings:
-# rubygem-nokogiri:
+# pull in yast2 installation related packages via package deps
+?skelcd-control-openSUSE:
+?skelcd-control-SLES:
+?skelcd-control-SLED:
rpm:
/bin
@@ -253,6 +218,7 @@
r /usr/lib/ia32el/auxapp
endif
+
yast2:
/etc
/usr
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.33/data/root/theme.file_list
new/installation-images-14.35/data/root/theme.file_list
--- old/installation-images-14.33/data/root/theme.file_list 2014-01-22
14:41:17.000000000 +0100
+++ new/installation-images-14.35/data/root/theme.file_list 2014-01-30
11:12:20.000000000 +0100
@@ -1,10 +1,10 @@
desktop-data-openSUSE:
/usr/share/desktop-data/qtrc
-yast2-qt-branding-<theme>:
+?yast2-qt-branding-<theme>:
/
-yast2-theme-<theme>:
+?yast2-theme-<theme>:
/
yast2-theme-<yast_theme>:
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
