From 867e6486e92d725862d92164c020e3cdeb95a14d Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 3 Sep 2017 13:56:56 -0400 Subject: maint: correctly filter unused go packages from the distribution --- LICENSE.txt | 2 +- Makefile | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 7c54cec..c7d2dea 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -4,8 +4,8 @@ The software in this repository is under a number of licenses: go/src/nshd/ GPL v2+ go/src/gopkg.in/yaml.v2 Apache v2.0 go/src/golang.org/x/sys/unix 3-clause BSD license + go/src/git.lukeshu.com/go/libgnulinux/crypt LGPL v2.1+ go/src/git.lukeshu.com/go/libgnulinux/dl GPL v2+, with documentation output clarification - go/src/git.lukeshu.com/go/libgnulinux/inotify LGPL v2.1+ go/src/git.lukeshu.com/go/libgnulinux/getgr LGPL v2.1+ go/src/git.lukeshu.com/go/libnslcd/ LGPL v2.1+ go/src/git.lukeshu.com/go/libsystemd/ Apache v2.0 diff --git a/Makefile b/Makefile index 271ecff..bd8ee0b 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,12 @@ include config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -files.src.src := $(filter-out go/golang.org/x/sys/plan9/% go/golang.org/x/sys/windows/%,$(files.src.src)) +unused_gopkg += golang.org/x/sys/plan9 +unused_gopkg += golang.org/x/sys/windows +unused_gopkg += git.lukeshu.com/go/libgnulinux/inotify +unused_gopkg += git.lukeshu.com/go/libsystemd/sd_id128 +unused_gopkg += git.lukeshu.com/go/libsystemd/sd_messages +_gitfiles.all := $(filter-out $(foreach p,$(unused_gopkg),go/src/$(p)/%),$(_gitfiles.all)) bins_c = nshd-setuid nshd-tester bins_go = nshd -- cgit v1.2.2