From: Paul Gortmaker <paul.gortma...@windriver.com> The temporary creation of a version header adds complications for builds where src != build (of which it doesn't use $(src) at all) and plus the dependencies on version.h were not working, leading to compile failures.
For an in tree build, the version will be never changing, so just make a static version header and junk all the Makefile complexity that we don't need. Signed-off-by: Paul Gortmaker <paul.gortma...@windriver.com> Signed-off-by: Liwei Song <liwei.s...@windriver.com> --- drivers/staging/crypto/cryptodev/.gitignore | 1 - drivers/staging/crypto/cryptodev/Makefile | 6 +----- drivers/staging/crypto/cryptodev/version.h | 1 + 3 files changed, 2 insertions(+), 6 deletions(-) create mode 100644 drivers/staging/crypto/cryptodev/version.h diff --git a/drivers/staging/crypto/cryptodev/.gitignore b/drivers/staging/crypto/cryptodev/.gitignore index 685e8eb..b04d840 100644 --- a/drivers/staging/crypto/cryptodev/.gitignore +++ b/drivers/staging/crypto/cryptodev/.gitignore @@ -20,7 +20,6 @@ tests/hash_comp tests/hashcrypt_speed releases scripts -version.h tests/cipher-aead tests/fullspeed examples/aes diff --git a/drivers/staging/crypto/cryptodev/Makefile b/drivers/staging/crypto/cryptodev/Makefile index c657c70..1c9b1e3 100644 --- a/drivers/staging/crypto/cryptodev/Makefile +++ b/drivers/staging/crypto/cryptodev/Makefile @@ -6,7 +6,6 @@ CRYPTODEV_CFLAGS ?= #-DENABLE_ASYNC KBUILD_CFLAGS += -I$(src) $(CRYPTODEV_CFLAGS) KERNEL_DIR ?= /lib/modules/$(shell uname -r)/build -VERSION = 1.6 PREFIX ?= cryptodev-objs = ioctl.o main.o cryptlib.o authenc.o zc.o util.o @@ -21,12 +20,9 @@ ifneq (${CROSS_COMPILE},) KERNEL_MAKE_OPTS += CROSS_COMPILE=${CROSS_COMPILE} endif -build: version.h +build: make ${KERNEL_MAKE_OPTS} modules -version.h: Makefile - @echo "#define VERSION \"$(VERSION)\"" > version.h - install: modules_install modules_install: diff --git a/drivers/staging/crypto/cryptodev/version.h b/drivers/staging/crypto/cryptodev/version.h new file mode 100644 index 0000000..83d49da --- /dev/null +++ b/drivers/staging/crypto/cryptodev/version.h @@ -0,0 +1 @@ +#define VERSION "1.6" -- 2.9.3 -- _______________________________________________ linux-yocto mailing list linux-yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/linux-yocto