commit f381c45633d3873ec32ecb2fa06b4bb8fd1e6fb3
Author: Jan Rękorajski <[email protected]>
Date: Wed Oct 23 11:59:48 2013 +0200
- always undefine alt_kernel, or its definition will leak through to
expanded macros
- there is no need for artificial value for main kernel, empty string does
just fine
test.spec | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/test.spec b/test.spec
index cf6d495..015b1ef 100644
--- a/test.spec
+++ b/test.spec
@@ -11,16 +11,18 @@
%if "%{_alt_kernel}" != "%{nil}"
%if 0%{?build_kernels:1}
-Error: alt_kernel and build_kernels are mutually exclusive
+%{error:alt_kernel and build_kernels are mutually exclusive}
+exit 1
%endif
%undefine with_userspace
%define _build_kernels %{alt_kernel}
%else
-%define _build_kernels
NIL%{?build_kernels:,%{?build_kernels}}
+%define _build_kernels
%{?build_kernels:,%{?build_kernels}}
%endif
-%define kpkg %(echo %{_build_kernels} | tr , '\\n' | while
read n ; do if [ $n = NIL ]; then echo %%undefine alt_kernel ; else echo
%%define alt_kernel $n ; fi ; echo %%kernel_pkg; done)
-%define bkpkg %(echo %{_build_kernels} | tr , '\\n' | while
read n ; do if [ $n = NIL ]; then echo %%undefine alt_kernel ; else echo
%%define alt_kernel $n ; fi ; echo %%build_kernel_pkg; done)
+%define kpkg %(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define
alt_kernel $n ; echo %%kernel_pkg ; done)
+%define bkpkg %(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define
alt_kernel $n ; echo %%build_kernel_pkg ; done)
+%define ikpkg %(echo %{_build_kernels} | tr , '\\n' | while
read n ; do echo %%undefine alt_kernel ; [ -z "$n" ] || echo %%define
alt_kernel $n ; echo %%install_kernel_pkg ; done)
%define rel 0.1
%define pname test
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/test.git/commitdiff/952ff23f11893c1e9ab097ea883e6abc30fed8c6
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
