From da4a2b80309c541df26637d585a04acb346ec4e5 Mon Sep 17 00:00:00 2001 From: Fred Wright Date: Sun, 23 Dec 2018 18:48:50 -0800 Subject: Fixes symlink handling in zip target. By default, zip follows symlinks rather than storing them as links in the archive. This resulted in redundant copies of the 'gps' subdirectory, which not only wasted space, but also wouldn't actually work in practice since they wouldn't get populated with the build products. Adding the 'y' option to the zip invocation fixes this. TESTED: Verified that the resulting zip archive has the expected symlinks, and that the content matches the repo. --- SConstruct | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'SConstruct') diff --git a/SConstruct b/SConstruct index 76d67a06..c0256e5d 100644 --- a/SConstruct +++ b/SConstruct @@ -2585,7 +2585,7 @@ if os.path.exists("gpsd.c") and os.path.exists(".gitignore"): # How to build a zip file. zip = env.Command('zip', distfiles, [ - '@zip -r gpsd-${VERSION}.zip $SOURCES', + '@zip -ry gpsd-${VERSION}.zip $SOURCES', '@ls -l gpsd-${VERSION}.zip', ]) env.Clean(zip, ["gpsd-${VERSION}.zip", "packaging/rpm/gpsd.spec"]) -- cgit v1.2.1