[PATCH] Makefile: add uapi level to dkms-install target

[PATCH] Makefile: add uapi level to dkms-install target

[Chet Gurevitch]

---
 src/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Makefile b/src/Makefile
index 960bbb4..f437de3 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -44,11 +44,13 @@ install:
 	$(MAKE) -C tools install
 
 DKMS_TOP_LEVEL := Makefile Kbuild Kconfig $(filter-out wireguard.mod.c, $(wildcard *.c)) $(filter-out version.h, $(wildcard *.h)) version.h dkms.conf
+DKMS_UAPI_LEVEL := $(wildcard uapi/*.c) $(wildcard uapi/*.h)
 DKMS_SELFTEST_LEVEL := $(wildcard selftest/*.c) $(wildcard selftest/*.h)
 DKMS_CRYPTO_LEVEL := $(wildcard crypto/*.c) $(wildcard crypto/*.h) $(wildcard crypto/*.S)
 DKMS_COMPAT_LEVEL := $(shell find compat/ -name '*.c' -o -name '*.h' -o -name '*.include')
-dkms-install: $(DKMS_TOP_LEVEL) $(DKMS_SELFTEST_LEVEL) $(DKMS_CRYPTO_LEVEL) $(DKMS_COMPAT_LEVEL)
+dkms-install: $(DKMS_TOP_LEVEL) $(DKMS_UAPI_LEVEL) $(DKMS_SELFTEST_LEVEL) $(DKMS_CRYPTO_LEVEL) $(DKMS_COMPAT_LEVEL)
 	@install -v -m0644 -D -t$(DESTDIR)$(DKMSDIR) $(DKMS_TOP_LEVEL)
+	@install -v -m0644 -D -t$(DESTDIR)$(DKMSDIR)/uapi $(DKMS_UAPI_LEVEL)
 	@install -v -m0644 -D -t$(DESTDIR)$(DKMSDIR)/selftest $(DKMS_SELFTEST_LEVEL)
 	@install -v -m0644 -D -t$(DESTDIR)$(DKMSDIR)/crypto $(DKMS_CRYPTO_LEVEL)
 	@for file in $(DKMS_COMPAT_LEVEL); do install -v -m0644 -D $$file $(DESTDIR)$(DKMSDIR)/$$file; done
-- 
2.14.2

Re: [PATCH] Makefile: add uapi level to dkms-install target

[Daniel Kahn Gillmor]

[-- Attachment #1: Type: text/plain, Size: 374 bytes --]

On Thu 2017-09-28 21:23:31 -0700, Chet Gurevitch wrote:
> add uapi level to dkms-install target

care to comment on the rationale for this?  dkms is the kernel module,
and aiui the ioctl interface is likely going away.  we don't want people
to be building tools that are bound to that interface unless they're
also bound to the same version of wireguard, right?

     --dkg

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

Re: [PATCH] Makefile: add uapi level to dkms-install target

[Jason A. Donenfeld]

Hey Chet,

Thanks for the patch. Indeed I hadn't finished that aspect of the
netlink stuff, so I'm glad you caught that before I made a snapshot.
I'll likely rebase this into the big netlink commit.

@dkg -- you were wondering what the purpose is. This is for the new
uapi/ directory, which needs to be accounted for in dkms, since
uapi/wireguard.h has replaced uapi.h during the recent Netlink
rewrite.

Jason