about summary refs log tree commit diff homepage
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2018-10-07 22:24:14 -0400
committerJune McEnroe <june@causal.agency>2018-10-07 22:24:14 -0400
commit8031787d62b51b38d0877c1d7380962112ba844e (patch)
tree5d1dc4724cbb198402446f8b853c362028f0cb3c
parentUse PascalCase for constants (diff)
downloadtorus-8031787d62b51b38d0877c1d7380962112ba844e.tar.gz
torus-8031787d62b51b38d0877c1d7380962112ba844e.zip
Link statically
-rw-r--r--Makefile14
1 files changed, 3 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 018550f..877a59b 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@ CHROOT_USER = torus
 CHROOT_GROUP = $(CHROOT_USER)
 
 CFLAGS += -Wall -Wextra -Wpedantic
+LDFLAGS += -static
 LDLIBS = -lcursesw
 BINS = server client meta merge
 OBJS = $(BINS:%=%.o)
@@ -30,24 +31,15 @@ chroot.tar: server client
 	install -d -o root -g wheel \
 	    root/bin \
 	    root/home \
-	    root/lib \
-	    root/libexec \
 	    root/usr \
 	    root/usr/share \
 	    root/usr/share/misc
 	install -d -o $(CHROOT_USER) -g $(CHROOT_GROUP) root/home/$(CHROOT_USER)
-	cp -p -f /libexec/ld-elf.so.1 root/libexec
-	cp -p -f \
-	    /lib/libc.so.7 \
-	    /lib/libedit.so.7 \
-	    /lib/libncurses.so.8 \
-	    /lib/libncursesw.so.8 \
-	    root/lib
 	cp -a -f /usr/share/locale root/usr/share
 	cp -p -f /usr/share/misc/termcap.db root/usr/share/misc
-	cp -p -f /bin/sh root/bin
+	cp -p -f /rescue/sh root/bin
 	install -o root -g wheel -m 555 server client root/bin
-	tar -c -f chroot.tar -C root bin home lib libexec usr
+	tar -c -f chroot.tar -C root bin home usr
 
 clean:
 	rm -f tags $(OBJS) $(BINS) chroot.tar
ermJune McEnroe 2021-02-07Add bindings for brightness controlJune McEnroe Weirdly the Fn key doesn't change how the F row registers... I wonder if I can do something about that. 2021-02-07Set X key repeat rateJune McEnroe 2021-02-07Bump font size to 12June McEnroe 11 is what I use on macOS, but I feel like my eyes are working harder here. 2021-02-07Fully configure and rebind cwmJune McEnroe This is sort of a mix of trying to emulate macOS somewhat for my muscle memory and just rebinding some of the cwm defaults to use 4- rather than M-. 2021-02-07Add BintiJune McEnroe 2021-02-07Finish configuring xtermJune McEnroe 2021-02-06Enable tapping, reverse scroll, set scaling in wsconsctlJune McEnroe 2021-02-06Set root window to black on purple snowJune McEnroe 2021-02-06Add xmodmap configurationJune McEnroe 2021-02-06Add initial OpenBSD X configurationJune McEnroe cwm still needs a lot more rebinding, and I need to actually look at its other options. xterm definitely still needs some configuration, but I at least managed to get it to use a decent looking font. Very happy that OpenBSD includes Luxi Mono, which is what my usual font, Go Mono, is based on anyway. Still missing is xmodmap and such. 2021-02-06Add xterm output to schemeJune McEnroe