Hello community, here is the log from the commit of package openafs for openSUSE:Factory checked in at 2018-06-28 15:14:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openafs (Old) and /work/SRC/openSUSE:Factory/.openafs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openafs" Thu Jun 28 15:14:50 2018 rev:5 rq:619532 version:1.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/openafs/openafs.changes 2018-05-08 13:37:33.909065490 +0200 +++ /work/SRC/openSUSE:Factory/.openafs.new/openafs.changes 2018-06-28 15:14:52.303433189 +0200 @@ -1,0 +2,8 @@ +Wed Jun 27 19:09:41 UTC 2018 - [email protected] + +- adjust building of KMP to new kernels (see boo 1098050) + add patch add_arch_to_linux_kernel_make.patch for this +- add libtirpc-devel to BuildRequires: +- minor cleanups + +------------------------------------------------------------------- New: ---- add_arch_to_linux_kernel_make.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openafs.spec ++++++ --- /var/tmp/diff_new_pack.CpdS6q/_old 2018-06-28 15:14:53.599430816 +0200 +++ /var/tmp/diff_new_pack.CpdS6q/_new 2018-06-28 15:14:53.603430809 +0200 @@ -100,7 +100,10 @@ Patch2: add_AFS_STRINGIZE_macro.patch # PATCH-FIX-UPSTREAM backport upstream patch Patch3: avoid_double_param_in_arm64_kernel.patch +# PATCH-FIX-UPSTREAM make configure detect ncurses 6 correctly Patch4: openafs-1.8.x.ncurses6.patch +# PATCH-SUSE-SPECIFIC make KMP work again +Patch5: add_arch_to_linux_kernel_make.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # @@ -112,10 +115,13 @@ BuildRequires: coreutils BuildRequires: fdupes BuildRequires: flex +BuildRequires: fuse-devel BuildRequires: git BuildRequires: krb5-devel +BuildRequires: libtirpc-devel BuildRequires: libtool BuildRequires: ncurses-devel +BuildRequires: pkg-config %if 0%{?suse_version} < 1210 Requires(post): %insserv_prereq @@ -123,14 +129,9 @@ Requires(post): %fillup_prereq %if %{build_kernel_modules} -BuildRequires: kernel-source -BuildRequires: kernel-syms -BuildRequires: module-init-tools +BuildRequires: %{kernel_module_package_buildreqs} %endif -BuildRequires: fuse-devel -BuildRequires: pkg-config - %description AFS is a cross-platform distributed file system product pioneered at Carnegie Mellon University and supported and developed as a product by @@ -235,7 +236,7 @@ Summary: OpenAFS Distributed File System - kernel module Group: System/Kernel -%suse_kernel_module_package lockdep um -p %_sourcedir/preamble +%kernel_module_package -x lockdep um pae -p %{S:30} %description KMP This package contains the kernel module for OpenAFS. For details see @@ -314,6 +315,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch5 -p1 %if %{run_regen} %patch4 -p1 @@ -379,8 +381,9 @@ rm -rf obj/$flavor cp -a libafs_tree obj/$flavor pushd obj/$flavor - ./configure --with-linux-kernel-build=/usr/src/linux-obj/%{_arch}/$flavor --with-linux-kernel-headers=/usr/src/linux \ + ./configure --with-linux-kernel-build=/usr/src/linux-obj/%{_target_cpu}/$flavor --with-linux-kernel-headers=/usr/src/linux \ --disable-transarc-paths + export LINUX_MAKE_ARCH=%{?linux_make_arch} make popd done @@ -452,7 +455,7 @@ export INSTALL_MOD_DIR=updates for flavor in %flavors_to_build; do - make -C /usr/src/linux-obj/%{_arch}/$flavor modules_install \ + make -C /usr/src/linux-obj/%{_arch}/$flavor %{?linux_make_arch} modules_install \ M=$PWD/`find obj/$flavor/ -name MODLOAD-\* -type d` done %endif ++++++ add_arch_to_linux_kernel_make.patch ++++++ --- openafs-1.8.0//src/libafs/MakefileProto.LINUX.in.orig 2018-06-27 07:57:10.916249040 +0200 +++ openafs-1.8.0//src/libafs/MakefileProto.LINUX.in 2018-06-27 07:57:56.492849436 +0200 @@ -320,7 +320,7 @@ ${LINUX_LIBAFS_NAME}.ko afspag.ko: .FORCE env EXTRA_CFLAGS="${EXTRA_CFLAGS}" @TOP_SRCDIR@/libafs/make_kbuild_makefile.pl ${KDIR} $@ @TOP_OBJDIR@/src/config/Makefile.config Makefile.afs Makefile.common ( env EXTRA_CFLAGS="${EXTRA_CFLAGS}" \ - $(MAKE) -C ${LINUX_KERNEL_BUILD} M=@TOP_OBJDIR@/src/libafs/${KDIR} modules 2>&1 \ + $(MAKE) -C ${LINUX_KERNEL_BUILD} ${LINUX_MAKE_ARCH} M=@TOP_OBJDIR@/src/libafs/${KDIR} modules 2>&1 \ || echo "FAILURE: make exit code $$?" ) | tee .makelog @if grep -E -q '^(FAILURE|WARNING)' .makelog; then \ grep -q '^WARNING' .makelog && echo "Error: Undefined symbols in modules" ; \ ++++++ preamble ++++++ --- /var/tmp/diff_new_pack.CpdS6q/_old 2018-06-28 15:14:53.823430406 +0200 +++ /var/tmp/diff_new_pack.CpdS6q/_new 2018-06-28 15:14:53.823430406 +0200 @@ -1,3 +1,3 @@ -Requires: kernel-%1 -Requires: %{name}-client = %{version} -Conflicts: %{name}-fuse-client = %{version} +Requires: kernel-%1 +Requires: %{name}-client = %{version} +Conflicts: %{name}-fuse-client = %{version}
