diff options
author | Saul Wold <Saul.Wold@intel.com> | 2010-08-31 16:48:22 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-09-02 09:50:49 +0100 |
commit | e384d62afaa17f8cd2124cb0785b18130c690e64 (patch) | |
tree | 2ae657f0d17f1ea359db038eb2a2af5232595ae4 /meta/recipes-extended/at/files | |
parent | ff9f1021c854b9752dd962595c113253475b8e65 (diff) | |
download | poky-e384d62afaa17f8cd2124cb0785b18130c690e64.tar.gz |
at: remove GPLv3 version
Signed-off-by: Saul Wold <Saul.Wold@intel.com>
Diffstat (limited to 'meta/recipes-extended/at/files')
-rw-r--r-- | meta/recipes-extended/at/files/nonrootinstall.patch | 75 | ||||
-rw-r--r-- | meta/recipes-extended/at/files/use-ldflags.patch | 21 |
2 files changed, 0 insertions, 96 deletions
diff --git a/meta/recipes-extended/at/files/nonrootinstall.patch b/meta/recipes-extended/at/files/nonrootinstall.patch deleted file mode 100644 index f760e85ae8..0000000000 --- a/meta/recipes-extended/at/files/nonrootinstall.patch +++ /dev/null | |||
@@ -1,75 +0,0 @@ | |||
1 | # Modify install rules to disable file ownership changes | ||
2 | # Disable stripping binaries | ||
3 | # Derived from an OE patch for at-3.1.8 | ||
4 | |||
5 | --- at-3.1.10.2.orig/Makefile.in 2005-08-29 01:08:28.000000000 -0700 | ||
6 | +++ at-3.1.10.2/Makefile.in 2010-07-21 17:06:01.000000000 -0700 | ||
7 | @@ -40,6 +40,10 @@ | ||
8 | LIBS = @LIBS@ | ||
9 | LIBOBJS = @LIBOBJS@ | ||
10 | INSTALL = @INSTALL@ | ||
11 | +ifeq ($(IROOT),) | ||
12 | +INSTALLOWN = -g root -o root | ||
13 | +DAEMONOWN = -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) | ||
14 | +endif | ||
15 | PAMLIB = @PAMLIB@ | ||
16 | |||
17 | CLONES = atq atrm | ||
18 | @@ -88,35 +92,38 @@ | ||
19 | $(CC) -c $(CFLAGS) $(DEFS) $*.c | ||
20 | |||
21 | install: all | ||
22 | - $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(etcdir) | ||
23 | - $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(bindir) | ||
24 | - $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(sbindir) | ||
25 | - $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(docdir) | ||
26 | - $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(atdocdir) | ||
27 | - $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(IROOT)$(ATSPOOL_DIR) $(IROOT)$(ATJOB_DIR) | ||
28 | + $(INSTALL) $(INSTALLOWN) -m 755 -d $(IROOT)$(etcdir) | ||
29 | + $(INSTALL) $(INSTALLOWN) -m 755 -d $(IROOT)$(bindir) | ||
30 | + $(INSTALL) $(INSTALLOWN) -m 755 -d $(IROOT)$(sbindir) | ||
31 | + $(INSTALL) $(INSTALLOWN) -m 755 -d $(IROOT)$(docdir) | ||
32 | + $(INSTALL) $(INSTALLOWN) -m 755 -d $(IROOT)$(atdocdir) | ||
33 | + $(INSTALL) $(INSTALLOWN) -m 755 -d $(IROOT)$(ATJOB_DIR) | ||
34 | + $(INSTALL) $(DAEMONOWN) -m 755 -d $(IROOT)$(ATSPOOL_DIR) | ||
35 | chmod 1770 $(IROOT)$(ATSPOOL_DIR) $(IROOT)$(ATJOB_DIR) | ||
36 | touch $(IROOT)$(LFILE) | ||
37 | chmod 600 $(IROOT)$(LFILE) | ||
38 | +ifeq ($(IROOT),) | ||
39 | chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(IROOT)$(LFILE) | ||
40 | - test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(IROOT)$(etcdir)/ | ||
41 | - $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 -s at $(IROOT)$(bindir) | ||
42 | +endif | ||
43 | + test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL) $(INSTALLOWN) -m 600 at.deny $(IROOT)$(etcdir)/ | ||
44 | + $(INSTALL) $(INSTALLOWN) -m 4755 at $(IROOT)$(bindir) | ||
45 | $(LN_S) -f at $(IROOT)$(bindir)/atq | ||
46 | $(LN_S) -f at $(IROOT)$(bindir)/atrm | ||
47 | - $(INSTALL) -g root -o root -m 755 batch $(IROOT)$(bindir) | ||
48 | - $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man1dir) | ||
49 | - $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man5dir) | ||
50 | - $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man8dir) | ||
51 | - $(INSTALL) -g root -o root -m 755 -s atd $(IROOT)$(sbindir) | ||
52 | - $(INSTALL) -g root -o root -m 755 atrun $(IROOT)$(sbindir) | ||
53 | - $(INSTALL) -g root -o root -m 644 at.1 $(IROOT)$(man1dir)/ | ||
54 | + $(INSTALL) $(INSTALLOWN) -m 755 batch $(IROOT)$(bindir) | ||
55 | + $(INSTALL) -d $(INSTALLOWN) -m 755 $(IROOT)$(man1dir) | ||
56 | + $(INSTALL) -d $(INSTALLOWN) -m 755 $(IROOT)$(man5dir) | ||
57 | + $(INSTALL) -d $(INSTALLOWN) -m 755 $(IROOT)$(man8dir) | ||
58 | + $(INSTALL) $(INSTALLOWN) -m 755 atd $(IROOT)$(sbindir) | ||
59 | + $(INSTALL) $(INSTALLOWN) -m 755 atrun $(IROOT)$(sbindir) | ||
60 | + $(INSTALL) $(INSTALLOWN) -m 644 at.1 $(IROOT)$(man1dir)/ | ||
61 | cd $(IROOT)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1 | ||
62 | - $(INSTALL) -g root -o root -m 644 atd.8 $(IROOT)$(man8dir)/ | ||
63 | + $(INSTALL) $(INSTALLOWN) -m 644 atd.8 $(IROOT)$(man8dir)/ | ||
64 | sed "s,\$${exec_prefix},$(exec_prefix),g" <atrun.8>tmpman | ||
65 | - $(INSTALL) -g root -o root -m 644 tmpman $(IROOT)$(man8dir)/atrun.8 | ||
66 | + $(INSTALL) $(INSTALLOWN) -m 644 tmpman $(IROOT)$(man8dir)/atrun.8 | ||
67 | rm -f tmpman | ||
68 | - $(INSTALL) -g root -o root -m 644 at_allow.5 $(IROOT)$(man5dir)/ | ||
69 | + $(INSTALL) $(INSTALLOWN) -m 644 at_allow.5 $(IROOT)$(man5dir)/ | ||
70 | cd $(IROOT)$(man5dir) && $(LN_S) -f at_allow.5 at_deny.5 | ||
71 | - $(INSTALL) -g root -o root -m 644 $(DOCS) $(IROOT)$(atdocdir) | ||
72 | + $(INSTALL) $(INSTALLOWN) -m 644 $(DOCS) $(IROOT)$(atdocdir) | ||
73 | rm -f $(IROOT)$(mandir)/cat1/at.1* $(IROOT)$(mandir)/cat1/batch.1* \ | ||
74 | $(IROOT)$(mandir)/cat1/atq.1* | ||
75 | rm -f $(IROOT)$(mandir)/cat1/atd.8* | ||
diff --git a/meta/recipes-extended/at/files/use-ldflags.patch b/meta/recipes-extended/at/files/use-ldflags.patch deleted file mode 100644 index 7d3d91a19a..0000000000 --- a/meta/recipes-extended/at/files/use-ldflags.patch +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | # Ensure use of $LDFLAGS during build | ||
2 | # Derived from an OE patch for at-3.1.8 | ||
3 | |||
4 | --- at-3.1.12.orig/Makefile.in 2009-11-23 07:11:52.000000000 -0800 | ||
5 | +++ at-3.1.12/Makefile.in 2010-07-20 16:28:04.000000000 -0700 | ||
6 | @@ -65,13 +65,13 @@ | ||
7 | all: at atd atrun | ||
8 | |||
9 | at: $(ATOBJECTS) | ||
10 | - $(CC) $(CFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB) | ||
11 | + $(CC) $(CFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB) $(LDFLAGS) | ||
12 | rm -f $(CLONES) | ||
13 | $(LN_S) -f at atq | ||
14 | $(LN_S) -f at atrm | ||
15 | |||
16 | atd: $(RUNOBJECTS) | ||
17 | - $(CC) $(CFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) | ||
18 | + $(CC) $(CFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) $(LDFLAGS) | ||
19 | |||
20 | y.tab.c y.tab.h: parsetime.y | ||
21 | $(YACC) -d parsetime.y | ||