Accepting request 619532 from filesystems
minor cleanups (forwarded request 619531 from hauky) OBS-URL: https://build.opensuse.org/request/show/619532 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openafs?expand=0&rev=5
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
8f745ac6dd
11
add_arch_to_linux_kernel_make.patch
Normal file
11
add_arch_to_linux_kernel_make.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- 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" ; \
|
||||||
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jun 27 19:09:41 UTC 2018 - christof.hanke@mpcdf.mpg.de
|
||||||
|
|
||||||
|
- 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
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri May 4 07:29:15 UTC 2018 - guillaume.gardet@opensuse.org
|
Fri May 4 07:29:15 UTC 2018 - guillaume.gardet@opensuse.org
|
||||||
|
|
||||||
|
|||||||
23
openafs.spec
23
openafs.spec
@ -100,7 +100,10 @@ Patch1: dont_require_AFS_SYSCALL.patch
|
|||||||
Patch2: add_AFS_STRINGIZE_macro.patch
|
Patch2: add_AFS_STRINGIZE_macro.patch
|
||||||
# PATCH-FIX-UPSTREAM backport upstream patch
|
# PATCH-FIX-UPSTREAM backport upstream patch
|
||||||
Patch3: avoid_double_param_in_arm64_kernel.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
|
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
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -112,10 +115,13 @@ BuildRequires: bison
|
|||||||
BuildRequires: coreutils
|
BuildRequires: coreutils
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: flex
|
BuildRequires: flex
|
||||||
|
BuildRequires: fuse-devel
|
||||||
BuildRequires: git
|
BuildRequires: git
|
||||||
BuildRequires: krb5-devel
|
BuildRequires: krb5-devel
|
||||||
|
BuildRequires: libtirpc-devel
|
||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
BuildRequires: ncurses-devel
|
BuildRequires: ncurses-devel
|
||||||
|
BuildRequires: pkg-config
|
||||||
|
|
||||||
%if 0%{?suse_version} < 1210
|
%if 0%{?suse_version} < 1210
|
||||||
Requires(post): %insserv_prereq
|
Requires(post): %insserv_prereq
|
||||||
@ -123,14 +129,9 @@ Requires(post): %insserv_prereq
|
|||||||
Requires(post): %fillup_prereq
|
Requires(post): %fillup_prereq
|
||||||
|
|
||||||
%if %{build_kernel_modules}
|
%if %{build_kernel_modules}
|
||||||
BuildRequires: kernel-source
|
BuildRequires: %{kernel_module_package_buildreqs}
|
||||||
BuildRequires: kernel-syms
|
|
||||||
BuildRequires: module-init-tools
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
BuildRequires: fuse-devel
|
|
||||||
BuildRequires: pkg-config
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
AFS is a cross-platform distributed file system product pioneered at
|
AFS is a cross-platform distributed file system product pioneered at
|
||||||
Carnegie Mellon University and supported and developed as a product by
|
Carnegie Mellon University and supported and developed as a product by
|
||||||
@ -235,7 +236,7 @@ module.
|
|||||||
Summary: OpenAFS Distributed File System - kernel module
|
Summary: OpenAFS Distributed File System - kernel module
|
||||||
Group: System/Kernel
|
Group: System/Kernel
|
||||||
|
|
||||||
%suse_kernel_module_package lockdep um -p %_sourcedir/preamble
|
%kernel_module_package -x lockdep um pae -p %{S:30}
|
||||||
|
|
||||||
%description KMP
|
%description KMP
|
||||||
This package contains the kernel module for OpenAFS. For details see
|
This package contains the kernel module for OpenAFS. For details see
|
||||||
@ -293,7 +294,7 @@ and load balancing, and ACLs. This package contains the OpenAFS client.
|
|||||||
: @@@ sysconf dir: %{_sysconfdir}
|
: @@@ sysconf dir: %{_sysconfdir}
|
||||||
: @@@ man dir: %{_mandir}
|
: @@@ man dir: %{_mandir}
|
||||||
: @@@ build modules: %{build_kernel_modules}
|
: @@@ build modules: %{build_kernel_modules}
|
||||||
: @@@ architecture: %{_arch}
|
: @@@ architecture: %{_arch}
|
||||||
: @@@ target cpu: %{_target_cpu}
|
: @@@ target cpu: %{_target_cpu}
|
||||||
: @@@
|
: @@@
|
||||||
: @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
|
: @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
|
||||||
@ -314,6 +315,7 @@ done
|
|||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
|
%patch5 -p1
|
||||||
|
|
||||||
%if %{run_regen}
|
%if %{run_regen}
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
@ -379,8 +381,9 @@ for flavor in %flavors_to_build; do
|
|||||||
rm -rf obj/$flavor
|
rm -rf obj/$flavor
|
||||||
cp -a libafs_tree obj/$flavor
|
cp -a libafs_tree obj/$flavor
|
||||||
pushd 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
|
--disable-transarc-paths
|
||||||
|
export LINUX_MAKE_ARCH=%{?linux_make_arch}
|
||||||
make
|
make
|
||||||
popd
|
popd
|
||||||
done
|
done
|
||||||
@ -452,7 +455,7 @@ export INSTALL_MOD_PATH=%{buildroot}
|
|||||||
export INSTALL_MOD_DIR=updates
|
export INSTALL_MOD_DIR=updates
|
||||||
|
|
||||||
for flavor in %flavors_to_build; do
|
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`
|
M=$PWD/`find obj/$flavor/ -name MODLOAD-\* -type d`
|
||||||
done
|
done
|
||||||
%endif
|
%endif
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user