From 143ea7b5463a1b5bbe0709f7aa9c5c70582ed566 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 20 May 2021 04:01:24 +0000 Subject: [PATCH] debian: make sure KVER and KDIR are visible to dpkg build The debuild clears up the environment, thus the essential SCST variables KVER and KDIR are cleared out. This patch fixes it. Note: technically, `debild` supports `--preserve-env` option. But in reality making use of it makes no difference, variables still do not appear. Work around it by using DEB_foo_SET from `man dpkg-buildflags` git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9423 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- Makefile | 2 +- debian/rules | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 92831a6d4..77ad72294 100644 --- a/Makefile +++ b/Makefile @@ -387,7 +387,7 @@ dpkg: ../scst_$(VERSION).orig.tar.gz else \ buildopts+=(-j4); \ fi && \ - debuild "$${buildopts[@]}" --lintian-opts --profile debian && \ + DEB_KVER_SET=$(KVER) DEB_KDIR_SET=$(KDIR) debuild "$${buildopts[@]}" --lintian-opts --profile debian && \ mkdir -p dpkg && \ for f in "$${output_files[@]}" ../scst_$(VERSION).orig.tar.[gx]z; do\ mv $$f dpkg || true; \ diff --git a/debian/rules b/debian/rules index f78e364a0..8342862e9 100755 --- a/debian/rules +++ b/debian/rules @@ -17,6 +17,11 @@ SUBDIRS=scst fcst iscsi-scst qla2x00t/qla2x00-target scst_local scstadmin srpt DESTDIR=$(CURDIR)/debian/tmp VERSION:=$(shell head -n1 debian/changelog | sed 's/.*(\([0-9.]*\).*).*/\1/') +# rules won't see variables unless they're using DEB_foo_SET syntax. So use that as +# an intermediary. Also, export variables for sub-makes to be able to see them. +export KVER=$(DEB_KVER_SET) +export KDIR=$(DEB_KDIR_SET) + %: echo "*** dh $@ ***" dh $@