Hello community,
here is the log from the commit of package installation-images-openSUSE for
openSUSE:Factory checked in at 2014-11-11 01:10:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/installation-images-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.installation-images-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "installation-images-openSUSE"
Changes:
--------
---
/work/SRC/openSUSE:Factory/installation-images-openSUSE/installation-images-openSUSE.changes
2014-10-31 18:27:28.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.installation-images-openSUSE.new/installation-images-openSUSE.changes
2014-11-11 01:10:57.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Nov 7 08:26:03 CET 2014 - [email protected]
+
+- aarch64: move kernel and initrd to boot/aarch64/loader
+- 14.149
+
+-------------------------------------------------------------------
Old:
----
installation-images-14.148.tar.xz
New:
----
installation-images-14.149.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.EPFBHK/_old 2014-11-11 01:10:59.000000000 +0100
+++ /var/tmp/diff_new_pack.EPFBHK/_new 2014-11-11 01:10:59.000000000 +0100
@@ -361,7 +361,7 @@
Summary: Installation Image Files for %theme
License: GPL-2.0+
Group: Metapackages
-Version: 14.148
+Version: 14.149
Release: 0
Provides: installation-images = %version-%release
Source: installation-images-%{version}.tar.xz
++++++ installation-images-14.148.tar.xz -> installation-images-14.149.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.148/Makefile
new/installation-images-14.149/Makefile
--- old/installation-images-14.148/Makefile 2014-10-27 13:14:48.000000000
+0100
+++ new/installation-images-14.149/Makefile 2014-11-07 08:24:22.000000000
+0100
@@ -37,9 +37,9 @@
endif
ifneq ($(filter aarch64, $(ARCH)),)
-ALL_TARGETS := initrd-themes initrd initrd+modules+gefrickel boot-grub2-efi
$(COMMON_TARGETS)
+ALL_TARGETS := initrd-themes initrd initrd+modules+gefrickel boot
boot-grub2-efi $(COMMON_TARGETS)
INSTSYS_PARTS := $(COMMON_INSTSYS_PARTS)
-BOOT_PARTS := initrd efi
+BOOT_PARTS := boot/* initrd efi
endif
ifneq ($(filter ppc ppc64 ppc64le, $(ARCH)),)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.148/VERSION
new/installation-images-14.149/VERSION
--- old/installation-images-14.148/VERSION 2014-10-27 13:14:48.000000000
+0100
+++ new/installation-images-14.149/VERSION 2014-11-07 08:24:22.000000000
+0100
@@ -1 +1 @@
-14.148
+14.149
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.148/changelog
new/installation-images-14.149/changelog
--- old/installation-images-14.148/changelog 2014-10-27 13:14:48.000000000
+0100
+++ new/installation-images-14.149/changelog 2014-11-07 08:24:22.000000000
+0100
@@ -1,3 +1,6 @@
+2014-11-05: 14.149
+ - aarch64: move kernel and initrd to boot/aarch64/loader
+
2014-10-27: 14.148
- follow rubygem package renaming
- ignore dependency on rubygem-yard
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.148/data/boot/boot.file_list
new/installation-images-14.149/data/boot/boot.file_list
--- old/installation-images-14.148/data/boot/boot.file_list 2014-10-27
13:14:48.000000000 +0100
+++ new/installation-images-14.149/data/boot/boot.file_list 2014-11-07
08:24:22.000000000 +0100
@@ -1,14 +1,18 @@
d loader
-x syslinux.cfg /loader/isolinux.cfg
+if arch eq 'i386' || arch eq 'x86_64'
+ x syslinux.cfg /loader/isolinux.cfg
+endif
<kernel_rpm>:
a /boot/<kernel_img> /loader/linux
-memtest86+:
- m /boot/memtest.bin /loader/memtest
+if arch eq 'i386' || arch eq 'x86_64'
+ memtest86+:
+ m /boot/memtest.bin /loader/memtest
-syslinux:
- m /usr/share/syslinux/isolinux.bin /loader
- m /usr/share/syslinux/gfxboot.c32 /loader
- e isolinux-config --base=/boot/<arch>/loader loader/isolinux.bin
+ syslinux:
+ m /usr/share/syslinux/isolinux.bin /loader
+ m /usr/share/syslinux/gfxboot.c32 /loader
+ e isolinux-config --base=/boot/<arch>/loader loader/isolinux.bin
+endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/installation-images-14.148/install.aarch64
new/installation-images-14.149/install.aarch64
--- old/installation-images-14.148/install.aarch64 2014-10-27
13:14:48.000000000 +0100
+++ new/installation-images-14.149/install.aarch64 2014-11-07
08:24:22.000000000 +0100
@@ -5,7 +5,7 @@
set -e
# create directory layout
-mkdir -p $DESTDIR/CD1/boot/$ARCH
+mkdir -p $DESTDIR/CD1/boot/$ARCH/loader
for theme in $THEMES ; do
mkdir -p $DESTDIR/branding/$theme/CD1/boot/$ARCH
done
@@ -21,12 +21,18 @@
[ -e images/$theme/$i ] && cp -r images/$theme/$i
$DESTDIR/branding/$theme/CD1/boot/$ARCH
done
- install -m 644 /boot/Image-* $DESTDIR/branding/$theme/CD1/boot/$ARCH/linux
-
if [ -d images/$theme/EFI ] ; then
mkdir -p $DESTDIR/branding/$theme/CD1/EFI/BOOT
cp -r images/$theme/EFI/EFI/BOOT/* $DESTDIR/branding/$theme/CD1/EFI/BOOT
fi
+
+ # might be missing if theme does not really exist
+ mkdir -p $DESTDIR/branding/$theme/CD1/boot/$ARCH/loader
+
+ # initrd goes to 'loader' dir
+ if [ -e $DESTDIR/branding/$theme/CD1/boot/$ARCH/initrd ] ; then
+ mv $DESTDIR/branding/$theme/CD1/boot/$ARCH/initrd
$DESTDIR/branding/$theme/CD1/boot/$ARCH/loader/initrd
+ fi
done
mkdir -p $DESTDIR/usr/share
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
