Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2016-07-10 18:46:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dracut (Old) and /work/SRC/openSUSE:Factory/.dracut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut" Changes: -------- --- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2016-06-13 21:54:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2016-07-10 18:46:43.000000000 +0200 @@ -1,0 +2,12 @@ +Mon Jul 4 12:19:43 UTC 2016 - [email protected] + +- Add 32bit arm support to installkernel + +------------------------------------------------------------------- +Fri Jun 17 11:24:26 UTC 2016 - [email protected] + +- Add 0213-10i18n-keymap-find.patch: + - Fix choice of keymap for inclusion (bsc#942896) + - Refresh 0301-include_sysconfig_language.patch + +------------------------------------------------------------------- @@ -5,0 +18,6 @@ + +------------------------------------------------------------------- +Tue May 31 12:53:28 UTC 2016 - [email protected] + +- fips-kernel-4.4-fixes.patch: adjust the kernel module list to + match the SLES 12 SP2 kernel. (bsc#976577) New: ---- 0213-10i18n-keymap-find.patch fips-kernel-4.4-fixes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.vpeNHA/_old 2016-07-10 18:46:45.000000000 +0200 +++ /var/tmp/diff_new_pack.vpeNHA/_new 2016-07-10 18:46:45.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package dracut # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -90,6 +90,7 @@ Patch126: 0126-01fips-Add-drbg-module-to-force-loaded-modules.patch Patch137: 0137-Switch-from-Mozilla-NSS-sha256hmac-checking-to-fipsc.patch Patch138: 0138-fips_add_aesni-intel.patch +Patch139: fips-kernel-4.4-fixes.patch # Others Patch20: 0020-00warpclock-Set-correct-timezone.patch @@ -132,6 +133,7 @@ Patch209: 0209-fix_modules_load_d_hostonly.patch Patch210: 0210-add_fcoe_uefi_check.patch Patch212: 0212-fcoe_reorder_init_path.patch +Patch213: 0213-10i18n-keymap-find.patch # SUSE-specific fixes Patch300: 0300-dracut_dont_use_dpkg_defaults_on_SUSE.patch @@ -263,6 +265,7 @@ %patch137 -p1 %patch138 -p1 +%patch139 -p1 %patch142 -p1 %patch144 -p1 @@ -305,6 +308,7 @@ %patch209 -p1 %patch210 -p1 %patch212 -p1 +%patch213 -p1 %patch300 -p1 %patch301 -p1 ++++++ 0213-10i18n-keymap-find.patch ++++++ From: Fabian Vogt <[email protected]> Subject: Fix wrong keymap inclusion References: bsc#942896 For MAP=lt, dracut would choose lt.std.map instead of lt.map. --- modules.d/10i18n/module-setup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: dracut-044/modules.d/10i18n/module-setup.sh =================================================================== --- dracut-044.orig/modules.d/10i18n/module-setup.sh +++ dracut-044/modules.d/10i18n/module-setup.sh @@ -30,8 +30,9 @@ install() { # This is from 10redhat-i18n. findkeymap () { local MAP=$1 + local MAPNAME=${1%.map*} [[ ! -f $MAP ]] && \ - MAP=$(find ${kbddir}/keymaps -type f -name $MAP -o -name $MAP.\* | head -n1) + MAP=$(find ${kbddir}/keymaps -type f -name ${MAPNAME} -o -name ${MAPNAME}.map -o -name ${MAPNAME}.map.\* | head -n1) [[ " $KEYMAPS " = *" $MAP "* ]] && return KEYMAPS="$KEYMAPS $MAP" case $MAP in ++++++ 0301-include_sysconfig_language.patch ++++++ --- /var/tmp/diff_new_pack.vpeNHA/_old 2016-07-10 18:46:45.000000000 +0200 +++ /var/tmp/diff_new_pack.vpeNHA/_new 2016-07-10 18:46:45.000000000 +0200 @@ -11,10 +11,10 @@ modules.d/10i18n/module-setup.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -Index: dracut-043/modules.d/10i18n/module-setup.sh +Index: dracut-044/modules.d/10i18n/module-setup.sh =================================================================== ---- dracut-043.orig/modules.d/10i18n/module-setup.sh -+++ dracut-043/modules.d/10i18n/module-setup.sh +--- dracut-044.orig/modules.d/10i18n/module-setup.sh ++++ dracut-044/modules.d/10i18n/module-setup.sh @@ -25,6 +25,7 @@ install() { KBDSUBDIRS=consolefonts,consoletrans,keymaps,unimaps DEFAULT_FONT="${i18n_default_font:-LatArCyrHeb-16}" @@ -23,7 +23,7 @@ VCONFIG_CONF="/etc/vconsole.conf" # This is from 10redhat-i18n. -@@ -211,9 +212,10 @@ install() { +@@ -212,9 +213,10 @@ install() { if dracut_module_included "systemd" && [[ -f ${I18N_CONF} ]]; then inst_simple ${I18N_CONF} ++++++ dracut-installkernel ++++++ --- /var/tmp/diff_new_pack.vpeNHA/_old 2016-07-10 18:46:45.000000000 +0200 +++ /var/tmp/diff_new_pack.vpeNHA/_new 2016-07-10 18:46:45.000000000 +0200 @@ -27,6 +27,9 @@ aarch64) BOOTFILE=Image ;; + armv*) + BOOTFILE=zImage + ;; *) BOOTFILE=vmlinuz ;; ++++++ fips-kernel-4.4-fixes.patch ++++++ Index: dracut-044/modules.d/01fips/module-setup.sh =================================================================== --- dracut-044.orig/modules.d/01fips/module-setup.sh +++ dracut-044/modules.d/01fips/module-setup.sh @@ -13,16 +13,17 @@ depends() { # called by dracut installkernel() { local _fipsmodules _mod - _fipsmodules="aead aes_generic aes-x86_64 ansi_cprng arc4 authenc authencesn blowfish camellia cast6 cbc ccm " - _fipsmodules+="chainiv crc32c crct10dif_generic cryptomgr crypto_null ctr cts deflate des des3_ede dm-crypt dm-mod drbg " - _fipsmodules+="ecb eseqiv fcrypt gcm ghash_generic hmac khazad lzo md4 md5 michael_mic rmd128 " - _fipsmodules+="rmd160 rmd256 rmd320 rot13 salsa20 seed seqiv serpent sha1 sha224 sha256 sha256_generic " - _fipsmodules+="sha384 sha512 sha512_generic tcrypt tea tnepres twofish wp256 wp384 wp512 xeta xtea xts zlib" - _fipsmodules+="aes_s390 des_s390 prng sha256_s390 sha_common des_check_key ghash_s390 sha1_s390 sha512_s390" - _fipsmodules+="sha512-ssse3 sha1-ssse3 sha256-ssse3 " - _fipsmodules+="ghash-clmulni-intel aesni-intel " - - _fipsmodules+="drbg" + _fipsmodules="ansi_cprng arc4 authenc ccm " + _fipsmodules+="ctr cts deflate drbg " + _fipsmodules+="ecb fcrypt gcm ghash_generic khazad md4 michael_mic rmd128 " + _fipsmodules+="rmd160 rmd256 rmd320 seed " + _fipsmodules+="sha512_generic tcrypt tea wp512 xts zlib " + _fipsmodules+="aes_s390 des_s390 sha256_s390 ghash_s390 sha1_s390 sha512_s390 " + _fipsmodules+="gf128mul " + _fipsmodules+="cmac vmac xcbc salsa20_generic salsa20_x86_64 camellia_generic camellia_x86_64 pcbc tgr192 anubis " + _fipsmodules+="cast6_generic cast5_generic cast_common sha512_ssse3 serpent_sse2_x86_64 serpent_generic twofish_generic " + _fipsmodules+="ablk_helper cryptd twofish_x86_64_3way lrw glue_helper twofish_x86_64 twofish_common blowfish_generic " + _fipsmodules+="blowfish_x86_64 blowfish_common des_generic " mkdir -m 0755 -p "${initdir}/etc/modprobe.d" Index: dracut-044/modules.d/01fips/fips.sh =================================================================== --- dracut-044.orig/modules.d/01fips/fips.sh +++ dracut-044/modules.d/01fips/fips.sh @@ -103,6 +103,7 @@ do_fips() -o "$_module" != "${_module%-ssse3}" \ -o "$_module" != "${_module%-x86_64}" \ -o "$_module" != "${_module%z90}" \ + -o "$_module" != "${_module%s390}" \ ]; then _found=1 fi
