summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMei Lei <lei.mei@intel.com>2010-10-21 12:36:51 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-10-21 13:52:01 +0100
commit0e0d14ed1e88ebff876abb3d00b08627a3879e8d (patch)
tree335844d5b995e324425c748c89b734aed87dc37a /meta
parent27d06858b5f3138039bddecc0eaaee1e05e21b48 (diff)
downloadpoky-0e0d14ed1e88ebff876abb3d00b08627a3879e8d.tar.gz
at: remove nonrootinstall patch and modify some relevant files
remove nonrootinstall patch, and use a patch named nonstripbinaries to modi fy the /at-3.1.10.2/Makefile.in, so it can also handles stripping of the bi naries Fix [BUG 246] Signed-off-by: Mei Lei <lei.mei@intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/at/at_3.1.12.bb2
-rw-r--r--meta/recipes-extended/at/files/nonrootinstall.patch75
-rw-r--r--meta/recipes-extended/at/files/nonstripbinaries.patch25
3 files changed, 26 insertions, 76 deletions
diff --git a/meta/recipes-extended/at/at_3.1.12.bb b/meta/recipes-extended/at/at_3.1.12.bb
index 999aa7fe3d..3be9489e4d 100644
--- a/meta/recipes-extended/at/at_3.1.12.bb
+++ b/meta/recipes-extended/at/at_3.1.12.bb
@@ -9,8 +9,8 @@ PR = "r3"
9 9
10SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \ 10SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \
11 file://configure.patch \ 11 file://configure.patch \
12 file://nonrootinstall.patch \
13 file://use-ldflags.patch \ 12 file://use-ldflags.patch \
13 file://nonstripbinaries.patch \
14 file://fix_parallel_build_error.patch \ 14 file://fix_parallel_build_error.patch \
15 file://posixtm.c \ 15 file://posixtm.c \
16 file://posixtm.h \ 16 file://posixtm.h \
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/nonstripbinaries.patch b/meta/recipes-extended/at/files/nonstripbinaries.patch
new file mode 100644
index 0000000000..f89aa65576
--- /dev/null
+++ b/meta/recipes-extended/at/files/nonstripbinaries.patch
@@ -0,0 +1,25 @@
1#Because remove nonrootinstall patch, the stripping of the binaries can not
2#be handled.
3#This patch is to handle the stripping of the binaries.
4#Mei Lei<lei.mei@intel.com> make this change
5diff --git a/build/downloads/at-3.1.12/Makefile.in b/build/downloads/at-3.1.12/Makefile.in
6index dae6b7d..71a5d89 100644
7--- a/build/downloads/at-3.1.12/Makefile.in
8+++ b/build/downloads/at-3.1.12/Makefile.in
9@@ -97,14 +97,14 @@ install: all
10 chmod 600 $(IROOT)$(LFILE)
11 chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(IROOT)$(LFILE)
12 test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(IROOT)$(etcdir)/
13- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 -s at $(IROOT)$(bindir)
14+ $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 at $(IROOT)$(bindir)
15 $(LN_S) -f at $(IROOT)$(bindir)/atq
16 $(LN_S) -f at $(IROOT)$(bindir)/atrm
17 $(INSTALL) -g root -o root -m 755 batch $(IROOT)$(bindir)
18 $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man1dir)
19 $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man5dir)
20 $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man8dir)
21- $(INSTALL) -g root -o root -m 755 -s atd $(IROOT)$(sbindir)
22+ $(INSTALL) -g root -o root -m 755 atd $(IROOT)$(sbindir)
23 $(INSTALL) -g root -o root -m 755 atrun $(IROOT)$(sbindir)
24 $(INSTALL) -g root -o root -m 644 at.1 $(IROOT)$(man1dir)/
25 cd $(IROOT)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1