1*4882a593SmuzhiyunFrom 71d9a23ab6a73ec1287acc683716481090095de0 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Peter Korsgaard <jacmet@sunsite.dk> 3*4882a593SmuzhiyunDate: Fri, 23 Jul 2021 16:47:56 +0200 4*4882a593SmuzhiyunSubject: [PATCH] Makefile.in: fix make install for non-root, don't strip 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunBuildroot will ensure all files are owned by root and stripped anyway 7*4882a593Smuzhiyun(if needed) before the rootfs is created. 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunSigned-off-by: Peter Korsgaard <jacmet@sunsite.dk> 10*4882a593SmuzhiyunSigned-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> 11*4882a593Smuzhiyun[Vincent: tweak the patch for the new version] 12*4882a593SmuzhiyunSigned-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> 13*4882a593Smuzhiyun[Giulio: convert patch to git format and rebase to version 3.2.2] 14*4882a593Smuzhiyun--- 15*4882a593Smuzhiyun Makefile.in | 47 +++++++++++++++++++++++------------------------ 16*4882a593Smuzhiyun 1 file changed, 23 insertions(+), 24 deletions(-) 17*4882a593Smuzhiyun 18*4882a593Smuzhiyundiff --git a/Makefile.in b/Makefile.in 19*4882a593Smuzhiyunindex a7197f2..0b35a67 100644 20*4882a593Smuzhiyun--- a/Makefile.in 21*4882a593Smuzhiyun+++ b/Makefile.in 22*4882a593Smuzhiyun@@ -99,43 +99,42 @@ atrun: atrun.in 23*4882a593Smuzhiyun $(CC) -c $(CFLAGS) $(DEFS) $*.c 24*4882a593Smuzhiyun 25*4882a593Smuzhiyun install: all 26*4882a593Smuzhiyun- $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(etcdir) 27*4882a593Smuzhiyun- $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(bindir) 28*4882a593Smuzhiyun- $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(sbindir) 29*4882a593Smuzhiyun- $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(atdatadir) 30*4882a593Smuzhiyun- $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(docdir) 31*4882a593Smuzhiyun- $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(atdocdir) 32*4882a593Smuzhiyun- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR) 33*4882a593Smuzhiyun+ $(INSTALL) -m 755 -d $(DESTDIR)$(etcdir) 34*4882a593Smuzhiyun+ $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) 35*4882a593Smuzhiyun+ $(INSTALL) -m 755 -d $(DESTDIR)$(sbindir) 36*4882a593Smuzhiyun+ $(INSTALL) -m 755 -d $(DESTDIR)$(atdatadir) 37*4882a593Smuzhiyun+ $(INSTALL) -m 755 -d $(DESTDIR)$(docdir) 38*4882a593Smuzhiyun+ $(INSTALL) -m 755 -d $(DESTDIR)$(atdocdir) 39*4882a593Smuzhiyun+ $(INSTALL) -m 755 -d $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR) 40*4882a593Smuzhiyun chmod 1770 $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR) 41*4882a593Smuzhiyun touch $(DESTDIR)$(LFILE) 42*4882a593Smuzhiyun chmod 600 $(DESTDIR)$(LFILE) 43*4882a593Smuzhiyun- chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(DESTDIR)$(LFILE) 44*4882a593Smuzhiyun- test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(DESTDIR)$(etcdir)/ 45*4882a593Smuzhiyun- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 at $(DESTDIR)$(bindir) 46*4882a593Smuzhiyun+ test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -m 640 at.deny $(DESTDIR)$(etcdir)/ 47*4882a593Smuzhiyun+ $(INSTALL) -m 6755 at $(DESTDIR)$(bindir) 48*4882a593Smuzhiyun $(LN_S) -f at $(DESTDIR)$(bindir)/atq 49*4882a593Smuzhiyun $(LN_S) -f at $(DESTDIR)$(bindir)/atrm 50*4882a593Smuzhiyun- $(INSTALL) -g root -o root -m 755 batch $(DESTDIR)$(bindir) 51*4882a593Smuzhiyun- $(INSTALL) -g root -o root -m 755 batch-job $(DESTDIR)$(atdatadir) 52*4882a593Smuzhiyun- $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man1dir) 53*4882a593Smuzhiyun- $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man5dir) 54*4882a593Smuzhiyun- $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man8dir) 55*4882a593Smuzhiyun- $(INSTALL) -g root -o root -m 755 atd $(DESTDIR)$(sbindir) 56*4882a593Smuzhiyun- $(INSTALL) -g root -o root -m 755 atrun $(DESTDIR)$(sbindir) 57*4882a593Smuzhiyun- $(INSTALL) -g root -o root -m 644 at.1 $(DESTDIR)$(man1dir)/ 58*4882a593Smuzhiyun+ $(INSTALL) -m 755 batch $(DESTDIR)$(bindir) 59*4882a593Smuzhiyun+ $(INSTALL) -m 755 batch-job $(DESTDIR)$(atdatadir) 60*4882a593Smuzhiyun+ $(INSTALL) -d -m 755 $(DESTDIR)$(man1dir) 61*4882a593Smuzhiyun+ $(INSTALL) -d -m 755 $(DESTDIR)$(man5dir) 62*4882a593Smuzhiyun+ $(INSTALL) -d -m 755 $(DESTDIR)$(man8dir) 63*4882a593Smuzhiyun+ $(INSTALL) -m 755 atd $(DESTDIR)$(sbindir) 64*4882a593Smuzhiyun+ $(INSTALL) -m 755 atrun $(DESTDIR)$(sbindir) 65*4882a593Smuzhiyun+ $(INSTALL) -m 644 at.1 $(DESTDIR)$(man1dir)/ 66*4882a593Smuzhiyun cd $(DESTDIR)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1 67*4882a593Smuzhiyun- $(INSTALL) -g root -o root -m 644 atd.8 $(DESTDIR)$(man8dir)/ 68*4882a593Smuzhiyun+ $(INSTALL) -m 644 atd.8 $(DESTDIR)$(man8dir)/ 69*4882a593Smuzhiyun sed "s,\$${exec_prefix},$(exec_prefix),g" <atrun.8>tmpman 70*4882a593Smuzhiyun- $(INSTALL) -g root -o root -m 644 tmpman $(DESTDIR)$(man8dir)/atrun.8 71*4882a593Smuzhiyun+ $(INSTALL) -m 644 tmpman $(DESTDIR)$(man8dir)/atrun.8 72*4882a593Smuzhiyun rm -f tmpman 73*4882a593Smuzhiyun- $(INSTALL) -g root -o root -m 644 at.allow.5 $(DESTDIR)$(man5dir)/ 74*4882a593Smuzhiyun+ $(INSTALL) -m 644 at.allow.5 $(DESTDIR)$(man5dir)/ 75*4882a593Smuzhiyun cd $(DESTDIR)$(man5dir) && $(LN_S) -f at.allow.5 at.deny.5 76*4882a593Smuzhiyun- $(INSTALL) -g root -o root -m 644 $(DOCS) $(DESTDIR)$(atdocdir) 77*4882a593Smuzhiyun+ $(INSTALL) -m 644 $(DOCS) $(DESTDIR)$(atdocdir) 78*4882a593Smuzhiyun rm -f $(DESTDIR)$(mandir)/cat1/at.1* $(DESTDIR)$(mandir)/cat1/batch.1* \ 79*4882a593Smuzhiyun $(DESTDIR)$(mandir)/cat1/atq.1* 80*4882a593Smuzhiyun rm -f $(DESTDIR)$(mandir)/cat1/atd.8* 81*4882a593Smuzhiyun if test x"$(systemdsystemunitdir)" != xno; then \ 82*4882a593Smuzhiyun- $(INSTALL) -o root -g root -m 755 -d $(DESTDIR)$(systemdsystemunitdir); \ 83*4882a593Smuzhiyun- $(INSTALL) -o root -g root -m 644 atd.service $(DESTDIR)$(systemdsystemunitdir); \ 84*4882a593Smuzhiyun+ $(INSTALL) -m 755 -d $(DESTDIR)$(systemdsystemunitdir); \ 85*4882a593Smuzhiyun+ $(INSTALL) -m 644 atd.service $(DESTDIR)$(systemdsystemunitdir); \ 86*4882a593Smuzhiyun fi 87*4882a593Smuzhiyun 88*4882a593Smuzhiyun dist: checkin $(DIST) $(LIST) Filelist.asc 89*4882a593Smuzhiyun-- 90*4882a593Smuzhiyun2.25.1 91*4882a593Smuzhiyun 92