From 0d333290a530164a7cbb62b5bc0e848d644069b6 Mon Sep 17 00:00:00 2001 From: Scott Garman Date: Fri, 23 Jul 2010 12:04:10 -0700 Subject: [PATCH] at: New recipe additions 3.1.10.2 and 3.1.12 * at 3.1.12 is GPLv3 * at 3.1.10.2 is latest GPLv2 Recipes and patches derived from OpenEmbedded Signed-off-by: Scott Garman --- .../packages/at/at-3.1.10.2/configure.patch | 22 ++++++ .../packages/at/at-3.1.12/configure.patch | 22 ++++++ meta-lsb/packages/at/at.inc | 13 ++++ meta-lsb/packages/at/at_3.1.10.2.bb | 14 ++++ meta-lsb/packages/at/at_3.1.12.bb | 14 ++++ .../packages/at/files/nonrootinstall.patch | 75 +++++++++++++++++++ meta-lsb/packages/at/files/use-ldflags.patch | 21 ++++++ 7 files changed, 181 insertions(+) create mode 100644 meta-lsb/packages/at/at-3.1.10.2/configure.patch create mode 100644 meta-lsb/packages/at/at-3.1.12/configure.patch create mode 100644 meta-lsb/packages/at/at.inc create mode 100644 meta-lsb/packages/at/at_3.1.10.2.bb create mode 100644 meta-lsb/packages/at/at_3.1.12.bb create mode 100644 meta-lsb/packages/at/files/nonrootinstall.patch create mode 100644 meta-lsb/packages/at/files/use-ldflags.patch diff --git a/meta-lsb/packages/at/at-3.1.10.2/configure.patch b/meta-lsb/packages/at/at-3.1.10.2/configure.patch new file mode 100644 index 0000000000..f6720111d6 --- /dev/null +++ b/meta-lsb/packages/at/at-3.1.10.2/configure.patch @@ -0,0 +1,22 @@ +# Fix cross-compilation issues in configure.ac +# Derived from an OE patch for at-3.1.8 + +--- at-3.1.10.2.orig/configure.in 2005-08-04 20:16:02.000000000 -0700 ++++ at-3.1.10.2/configure.in 2010-07-21 15:52:38.000000000 -0700 +@@ -37,12 +37,11 @@ + AC_MSG_RESULT(no) + ;; + esac ++if [ X"${cross_compiling}" = Xno ]; then + AC_MSG_CHECKING(Trying to compile a trivial ANSI C program) +-AC_TRY_RUN([ main(int ac, char **av) { return 0; } ], +- AC_MSG_RESULT(yes), +- AC_MSG_RESULT(no) +- AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.), +- AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)) ++AC_RUN_IFELSE([AC_LANG_SOURCE([[ main(int ac, char **av) { return 0; } ]])],[AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no) ++ AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)],[AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)]) ++fi + + AC_MSG_CHECKING(__attribute__((noreturn))) + AC_TRY_COMPILE([], [void __attribute__((noreturn)) panic(void);], diff --git a/meta-lsb/packages/at/at-3.1.12/configure.patch b/meta-lsb/packages/at/at-3.1.12/configure.patch new file mode 100644 index 0000000000..6ab528d0b2 --- /dev/null +++ b/meta-lsb/packages/at/at-3.1.12/configure.patch @@ -0,0 +1,22 @@ +# Fix cross-compilation issues in configure.ac +# Derived from an OE patch for at-3.1.8 + +--- at-3.1.12.orig/configure.ac 2009-11-23 07:11:52.000000000 -0800 ++++ at-3.1.12/configure.ac 2010-07-20 16:23:14.000000000 -0700 +@@ -38,12 +38,11 @@ + AC_MSG_RESULT(no) + ;; + esac ++if [ X"${cross_compiling}" = Xno ]; then + AC_MSG_CHECKING(Trying to compile a trivial ANSI C program) +-AC_TRY_RUN([ main(int ac, char **av) { return 0; } ], +- AC_MSG_RESULT(yes), +- AC_MSG_RESULT(no) +- AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.), +- AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)) ++AC_RUN_IFELSE([AC_LANG_SOURCE([[ main(int ac, char **av) { return 0; } ]])], [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no) ++ AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)], [AC_MSG_ERROR(Could not compile and run even a trivial ANSI C program - check CC.)]) ++fi + + AC_MSG_CHECKING(__attribute__((noreturn))) + AC_TRY_COMPILE([], [void __attribute__((noreturn)) panic(void);], diff --git a/meta-lsb/packages/at/at.inc b/meta-lsb/packages/at/at.inc new file mode 100644 index 0000000000..2ced0c2a9f --- /dev/null +++ b/meta-lsb/packages/at/at.inc @@ -0,0 +1,13 @@ +DESCRIPTION = "Delayed job execution and batch processing" +SECTION = "base" +DEPENDS = "flex" +RCONFLICTS_${PN} = "atd" +RREPLACES_${PN} = "atd" + +inherit autotools + +export LIBS = "-L${STAGING_LIBDIR}" + +do_install () { + oe_runmake "IROOT=${D}" install +} diff --git a/meta-lsb/packages/at/at_3.1.10.2.bb b/meta-lsb/packages/at/at_3.1.10.2.bb new file mode 100644 index 0000000000..ff4cf489b3 --- /dev/null +++ b/meta-lsb/packages/at/at_3.1.10.2.bb @@ -0,0 +1,14 @@ +require at.inc + +LICENSE="GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" + +PR = "r0" + +SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.tar.gz \ + file://configure.patch \ + file://nonrootinstall.patch \ + file://use-ldflags.patch" + +SRC_URI[md5sum] = "485688690a0aae53224c4150867da334" +SRC_URI[sha256sum] = "35c4ab4248ba5898ccaddc5efe8722a8f3639deeb07623fa2d41f740e337690f" diff --git a/meta-lsb/packages/at/at_3.1.12.bb b/meta-lsb/packages/at/at_3.1.12.bb new file mode 100644 index 0000000000..141168dc9a --- /dev/null +++ b/meta-lsb/packages/at/at_3.1.12.bb @@ -0,0 +1,14 @@ +require at.inc + +LICENSE="GPLv2+ & GPLv3+" +LIC_FILES_CHKSUM = "file://Copyright;md5=dffa11c636884752fbf0b2a159b2883a" + +PR = "r0" + +SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \ + file://configure.patch \ + file://nonrootinstall.patch \ + file://use-ldflags.patch" + +SRC_URI[md5sum] = "1e67991776148fb319fd77a2e599a765" +SRC_URI[sha256sum] = "7c55c6ab4fbe8add9e68f31b2b0ebf3fe805c9a4e7cfb2623a3d8a4789cc18f3" diff --git a/meta-lsb/packages/at/files/nonrootinstall.patch b/meta-lsb/packages/at/files/nonrootinstall.patch new file mode 100644 index 0000000000..f760e85ae8 --- /dev/null +++ b/meta-lsb/packages/at/files/nonrootinstall.patch @@ -0,0 +1,75 @@ +# Modify install rules to disable file ownership changes +# Disable stripping binaries +# Derived from an OE patch for at-3.1.8 + +--- at-3.1.10.2.orig/Makefile.in 2005-08-29 01:08:28.000000000 -0700 ++++ at-3.1.10.2/Makefile.in 2010-07-21 17:06:01.000000000 -0700 +@@ -40,6 +40,10 @@ + LIBS = @LIBS@ + LIBOBJS = @LIBOBJS@ + INSTALL = @INSTALL@ ++ifeq ($(IROOT),) ++INSTALLOWN = -g root -o root ++DAEMONOWN = -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) ++endif + PAMLIB = @PAMLIB@ + + CLONES = atq atrm +@@ -88,35 +92,38 @@ + $(CC) -c $(CFLAGS) $(DEFS) $*.c + + install: all +- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(etcdir) +- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(bindir) +- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(sbindir) +- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(docdir) +- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(atdocdir) +- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(IROOT)$(ATSPOOL_DIR) $(IROOT)$(ATJOB_DIR) ++ $(INSTALL) $(INSTALLOWN) -m 755 -d $(IROOT)$(etcdir) ++ $(INSTALL) $(INSTALLOWN) -m 755 -d $(IROOT)$(bindir) ++ $(INSTALL) $(INSTALLOWN) -m 755 -d $(IROOT)$(sbindir) ++ $(INSTALL) $(INSTALLOWN) -m 755 -d $(IROOT)$(docdir) ++ $(INSTALL) $(INSTALLOWN) -m 755 -d $(IROOT)$(atdocdir) ++ $(INSTALL) $(INSTALLOWN) -m 755 -d $(IROOT)$(ATJOB_DIR) ++ $(INSTALL) $(DAEMONOWN) -m 755 -d $(IROOT)$(ATSPOOL_DIR) + chmod 1770 $(IROOT)$(ATSPOOL_DIR) $(IROOT)$(ATJOB_DIR) + touch $(IROOT)$(LFILE) + chmod 600 $(IROOT)$(LFILE) ++ifeq ($(IROOT),) + chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(IROOT)$(LFILE) +- test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(IROOT)$(etcdir)/ +- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 -s at $(IROOT)$(bindir) ++endif ++ test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL) $(INSTALLOWN) -m 600 at.deny $(IROOT)$(etcdir)/ ++ $(INSTALL) $(INSTALLOWN) -m 4755 at $(IROOT)$(bindir) + $(LN_S) -f at $(IROOT)$(bindir)/atq + $(LN_S) -f at $(IROOT)$(bindir)/atrm +- $(INSTALL) -g root -o root -m 755 batch $(IROOT)$(bindir) +- $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man1dir) +- $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man5dir) +- $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man8dir) +- $(INSTALL) -g root -o root -m 755 -s atd $(IROOT)$(sbindir) +- $(INSTALL) -g root -o root -m 755 atrun $(IROOT)$(sbindir) +- $(INSTALL) -g root -o root -m 644 at.1 $(IROOT)$(man1dir)/ ++ $(INSTALL) $(INSTALLOWN) -m 755 batch $(IROOT)$(bindir) ++ $(INSTALL) -d $(INSTALLOWN) -m 755 $(IROOT)$(man1dir) ++ $(INSTALL) -d $(INSTALLOWN) -m 755 $(IROOT)$(man5dir) ++ $(INSTALL) -d $(INSTALLOWN) -m 755 $(IROOT)$(man8dir) ++ $(INSTALL) $(INSTALLOWN) -m 755 atd $(IROOT)$(sbindir) ++ $(INSTALL) $(INSTALLOWN) -m 755 atrun $(IROOT)$(sbindir) ++ $(INSTALL) $(INSTALLOWN) -m 644 at.1 $(IROOT)$(man1dir)/ + cd $(IROOT)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1 +- $(INSTALL) -g root -o root -m 644 atd.8 $(IROOT)$(man8dir)/ ++ $(INSTALL) $(INSTALLOWN) -m 644 atd.8 $(IROOT)$(man8dir)/ + sed "s,\$${exec_prefix},$(exec_prefix),g" tmpman +- $(INSTALL) -g root -o root -m 644 tmpman $(IROOT)$(man8dir)/atrun.8 ++ $(INSTALL) $(INSTALLOWN) -m 644 tmpman $(IROOT)$(man8dir)/atrun.8 + rm -f tmpman +- $(INSTALL) -g root -o root -m 644 at_allow.5 $(IROOT)$(man5dir)/ ++ $(INSTALL) $(INSTALLOWN) -m 644 at_allow.5 $(IROOT)$(man5dir)/ + cd $(IROOT)$(man5dir) && $(LN_S) -f at_allow.5 at_deny.5 +- $(INSTALL) -g root -o root -m 644 $(DOCS) $(IROOT)$(atdocdir) ++ $(INSTALL) $(INSTALLOWN) -m 644 $(DOCS) $(IROOT)$(atdocdir) + rm -f $(IROOT)$(mandir)/cat1/at.1* $(IROOT)$(mandir)/cat1/batch.1* \ + $(IROOT)$(mandir)/cat1/atq.1* + rm -f $(IROOT)$(mandir)/cat1/atd.8* diff --git a/meta-lsb/packages/at/files/use-ldflags.patch b/meta-lsb/packages/at/files/use-ldflags.patch new file mode 100644 index 0000000000..7d3d91a19a --- /dev/null +++ b/meta-lsb/packages/at/files/use-ldflags.patch @@ -0,0 +1,21 @@ +# Ensure use of $LDFLAGS during build +# Derived from an OE patch for at-3.1.8 + +--- at-3.1.12.orig/Makefile.in 2009-11-23 07:11:52.000000000 -0800 ++++ at-3.1.12/Makefile.in 2010-07-20 16:28:04.000000000 -0700 +@@ -65,13 +65,13 @@ + all: at atd atrun + + at: $(ATOBJECTS) +- $(CC) $(CFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB) ++ $(CC) $(CFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB) $(LDFLAGS) + rm -f $(CLONES) + $(LN_S) -f at atq + $(LN_S) -f at atrm + + atd: $(RUNOBJECTS) +- $(CC) $(CFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) ++ $(CC) $(CFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB) $(LDFLAGS) + + y.tab.c y.tab.h: parsetime.y + $(YACC) -d parsetime.y