From daaf1b7eb9aad6b3410c8992e0b3991854e1de87 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 7 Dec 2012 15:12:36 -0500 Subject: Complete setsysfont removal. --- src/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index d93e7202..81401431 100644 --- a/src/Makefile +++ b/src/Makefile @@ -35,7 +35,6 @@ install: install -m 644 ipcalc.1 $(ROOT)$(mandir)/man1 install -m 644 consoletype.1 $(ROOT)$(mandir)/man1 install -m 644 ifup.8 $(ROOT)$(mandir)/man8 - install -m 644 setsysfont.8 $(ROOT)$(mandir)/man8 install -m 644 sushell.8 $(ROOT)$(mandir)/man8 ln -s ifup.8 $(ROOT)$(mandir)/man8/ifdown.8 -- cgit v1.2.1 From a0fdaf95678703c2c64fc8ca7fa548f5182f28bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 19 Jan 2013 18:15:40 +0200 Subject: Build with $RPM_LD_FLAGS. --- src/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index 81401431..45447739 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,4 +1,5 @@ CFLAGS+=$(RPM_OPT_FLAGS) -Wall -D_GNU_SOURCE +LDFLAGS+=$(RPM_LD_FLAGS) PROGS=usernetctl netreport usleep ipcalc \ ppp-watch consoletype genhostid rename_device -- cgit v1.2.1 From ec49b3efa64a4e964e39dd443fc24deba47c7df3 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Thu, 7 Mar 2013 14:06:54 +0100 Subject: move stuff directly to /usr (#905492) --- src/Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index 45447739..05b1379a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -18,16 +18,16 @@ clean: rm -f $(PROGS) *.o *~ install: - mkdir -p $(ROOT)/bin $(ROOT)/usr/sbin $(ROOT)$(mandir)/man{1,8} $(ROOT)/etc $(ROOT)/lib/udev - install -m 755 usleep $(ROOT)/bin/usleep + mkdir -p $(ROOT)/usr/bin $(ROOT)/usr/sbin $(ROOT)$(mandir)/man{1,8} $(ROOT)/etc $(ROOT)/usr/lib/udev + install -m 755 usleep $(ROOT)/usr/bin/usleep install -m 4755 usernetctl $(ROOT)/usr/sbin/usernetctl - install -m 2755 netreport $(ROOT)/sbin/netreport - install -m 755 ipcalc $(ROOT)/bin/ipcalc - install -m 755 genhostid $(ROOT)/sbin/genhostid - install -m 755 ppp-watch $(ROOT)/sbin/ppp-watch - install -m 755 consoletype $(ROOT)/sbin/consoletype - install -m 755 sushell $(ROOT)/sbin/sushell - install -m 755 rename_device $(ROOT)/lib/udev/rename_device + install -m 2755 netreport $(ROOT)/usr/sbin/netreport + install -m 755 ipcalc $(ROOT)/usr/bin/ipcalc + install -m 755 genhostid $(ROOT)/usr/sbin/genhostid + install -m 755 ppp-watch $(ROOT)/usr/sbin/ppp-watch + install -m 755 consoletype $(ROOT)/usr/sbin/consoletype + install -m 755 sushell $(ROOT)/usr/sbin/sushell + install -m 755 rename_device $(ROOT)/usr/lib/udev/rename_device install -m 644 genhostid.1 $(ROOT)$(mandir)/man1 install -m 644 netreport.1 $(ROOT)$(mandir)/man1 install -m 644 usleep.1 $(ROOT)$(mandir)/man1 -- cgit v1.2.1 From 4c13a49abb8a7d8fcf58238b706ff71f1e2d83fc Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Thu, 7 Mar 2013 18:35:54 +0100 Subject: compile netreport and usernetctl with full RELRO and PIE (#853178) --- src/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index 05b1379a..dc4bf593 100644 --- a/src/Makefile +++ b/src/Makefile @@ -52,7 +52,13 @@ usernetctl.o: usernetctl.c $(CC) $(CFLAGS) -fPIE -c usernetctl.c -o usernetctl.o usernetctl: usernetctl.c usernetctl.o - $(CC) $(LDFLAGS) -pie -o $@ $@.o + $(CC) $(LDFLAGS) -pie -z relro -z now -o $@ $@.o + +netreport.o: netreport.c + $(CC) $(CFLAGS) -fPIE -c netreport.c -o netreport.o + +netreport: netreport.o + $(CC) $(LDFLAGS) -pie -z relro -z now -o $@ $@.o shvar.o: shvar.c $(CC) $(CFLAGS) `pkg-config glib-2.0 --cflags` -c shvar.c -o shvar.o -- cgit v1.2.1