summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-07-31 13:04:48 -0400
committerJune McEnroe <june@causal.agency>2020-07-31 13:04:48 -0400
commit387f2c1fa3245a978a27b1b50072d11b6fc679f7 (patch)
tree53acb593084c85129e3f43a3fa982aa7bf3e33ac
parentFix path of cert.pem in chroot (diff)
downloadcatgirl-387f2c1fa3245a978a27b1b50072d11b6fc679f7.tar.gz
catgirl-387f2c1fa3245a978a27b1b50072d11b6fc679f7.zip
Use ldd to automatically copy libs into chroot
Diffstat (limited to '')
-rw-r--r--Makefile11
1 files changed, 2 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 4c75e4b..08e90ab 100644
--- a/Makefile
+++ b/Makefile
@@ -73,15 +73,8 @@ chroot.tar: catgirl catgirl.1 scripts/chroot-prompt.sh scripts/chroot-man.sh
 		root/home/${CHROOT_USER} \
 		root/home/${CHROOT_USER}/.local/share
 	cp -fp /libexec/ld-elf.so.1 root/libexec
-	cp -fp \
-		/lib/libc.so.7 \
-		/lib/libncursesw.so.8 \
-		/lib/libthr.so.3 \
-		/lib/libz.so.6 \
-		/usr/local/lib/libcrypto.so.46 \
-		/usr/local/lib/libssl.so.48 \
-		/usr/local/lib/libtls.so.20 \
-		root/lib
+	ldd -f '%p\n' catgirl /usr/bin/mandoc /usr/bin/less \
+		| sort -u | xargs -t -J % cp -fp % root/lib
 	chflags noschg root/libexec/* root/lib/*
 	cp -fp /etc/hosts /etc/resolv.conf root/etc
 	cp -fp /usr/local/etc/ssl/cert.pem root/usr/local/etc/ssl
'>2019-02-20Factor out html.sh and produce html for all sourcesJune McEnroe 2019-02-20Add Dirk Gently's Holistic Detective AgencyJune McEnroe 2019-02-20Move /opt/pkg after /usr in PATHJune McEnroe 2019-02-20Set man_hard_wrap in nvimJune McEnroe 2019-02-18Use hi -o anchor in upJune McEnroe 2019-02-18Don't match nested parentheses in Tag for CJune McEnroe 2019-02-18Match whitespace between * [] {}June McEnroe 2019-02-18Fix function-like #define regexJune McEnroe 2019-02-18Match Tag in RustJune McEnroe 2019-02-18Match sh functions as TagJune McEnroe 2019-02-18Match Sh and Ss as Tag in mdocJune McEnroe 2019-02-18Match statics and typedefs as TagJune McEnroe 2019-02-18Clean up htmlHeaderJune McEnroe 2019-02-18Remove hi line numberingJune McEnroe 2019-02-18Add Tag class to hiJune McEnroe 2019-02-17Generate HTML with hi -n -f html -o anchorJune McEnroe 2019-02-17Add hi -f html -o anchor for line number linksJune McEnroe 2019-02-17Simplify temp trap in upJune McEnroe 2019-02-17Add line numbers to hiJune McEnroe 2019-02-17Always split spans after newlinesJune McEnroe 2019-02-15Color format specifiers light cyan in vimJune McEnroe 2019-02-15Highlight Interp as yellowJune McEnroe 2019-02-15Highlight strings in sh command substitutionsJune McEnroe 2019-02-15Add nmap gpJune McEnroe 2019-02-14Avoid newline when copying URL to pasteboardJune McEnroe 2019-02-13Add forgotten "sixth" book of H2G2June McEnroe