mirror
/
darling
mirror of https://github.com/darlinghq/darling
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Debian packaging and make setcap respect DESTDIR 

Because we now build a single package, DESTDIR is actually
`debian/<package-name>` rather than `debian/tmp`
(see https://www.debian.org/doc/manuals/debmake-doc/ch05.en.html#rules).
This means that we actually don't need to add `usr` to be installed;
it's already installed to the staging directory.

Additionally, setcap now respects the DESTDIR variable (used when
building the Debian package).
This commit is contained in:
Ariel Abreu 2022-03-03 10:27:11 -05:00
parent 09916ea6b2
commit 549fac0475
No known key found for this signature in database
GPG Key ID: D67AE16CCEA85B70
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/setcap.cmake
View File

@ -5,7 +5,7 @@ install(CODE "execute_process(
COMMAND
${SETCAP_EXECUTABLE}
${caps}
${CMAKE_INSTALL_PREFIX}/${file}
\$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${file}
RESULT_VARIABLE
_SETCAP_RESULT
)

1
debian/darling.install vendored
View File

@ -1,2 +1 @@
usr
tools/shutdown-user.sh usr/lib/darling