Commit 97ab9b4c authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

at: bump version, fix make install, convert to Makefile.autotools.in format 



Make install would fail if target != host, as it tried to use host strip
for install -s.

Patch 1-5 from ptxdist.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 819e7f5b

package/at/S99at

0 → 100755
+38 −0
Original line number Diff line number Diff line 
#!/bin/sh

#

# Starts at daemon

#



umask 077



start() {

	echo -n "Starting atd: "

	start-stop-daemon --start --quiet --make-pidfile --pidfile /var/run/atd.pid --background --exec /usr/sbin/atd -- -f

	echo "OK"

}

stop() {

	echo -n "Stopping atd: "

	start-stop-daemon --stop --quiet --pidfile /var/run/atd.pid

	echo "OK"

}

restart() {

	stop

	start

}



case "$1" in

  start)

	start

	;;

  stop)

	stop

	;;

  restart|reload)

	restart

	;;

  *)

	echo $"Usage: $0 {start|stop|restart}"

	exit 1

esac



exit $?

package/at/at-3.1.12-0001-configure.ac-remove-manual-compiler-check-with-AC_TR.patch

0 → 100644
+33 −0
Original line number Diff line number Diff line 
From a182f18fa3b9fb3dd817b601b51c758f9a77f407 Mon Sep 17 00:00:00 2001

From: Marc Kleine-Budde <mkl@pengutronix.de>

Date: Tue, 1 Dec 2009 17:08:14 +0100

Subject: [PATCH 1/5] configure.ac: remove manual compiler check with AC_TRY_RUN



AC_TRY_RUN breaks cross compilation, so remove it. autotools will take

care about a working (cross-) compiler.



Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

---

 configure.ac |    6 ------

 1 files changed, 0 insertions(+), 6 deletions(-)



diff --git a/configure.ac b/configure.ac

index a8c2a14..997a37f 100644

--- a/configure.ac

+++ b/configure.ac

@@ -38,12 +38,6 @@ case "$host" in

     AC_MSG_RESULT(no)

     ;;

 esac

-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_MSG_CHECKING(__attribute__((noreturn)))

 AC_TRY_COMPILE([], [void __attribute__((noreturn)) panic(void);],

-- 

1.6.5.3

package/at/at-3.1.12-0002-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch

0 → 100644
+34 −0
Original line number Diff line number Diff line 
From e12c96cccab550eda31cf7bb1dedddd3670ffe69 Mon Sep 17 00:00:00 2001

From: Marc Kleine-Budde <mkl@pengutronix.de>

Date: Tue, 1 Dec 2009 17:22:22 +0100

Subject: [PATCH 2/5] configure.ac: convert AC_TRY_COMPILE -> AC_COMPILE_IFELSE



Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

---

 configure.ac |   10 +++++-----

 1 files changed, 5 insertions(+), 5 deletions(-)



diff --git a/configure.ac b/configure.ac

index 997a37f..cab80ed 100644

--- a/configure.ac

+++ b/configure.ac

@@ -40,11 +40,11 @@ case "$host" in

 esac

 

 AC_MSG_CHECKING(__attribute__((noreturn)))

-AC_TRY_COMPILE([], [void __attribute__((noreturn)) panic(void);],

-    AC_MSG_RESULT(yes)

-    AC_DEFINE(HAVE_ATTRIBUTE_NORETURN, 1,

-	      [Define to 1 if compiler supports __attribute__((noreturn))]),

-    AC_MSG_RESULT(no)

+AC_COMPILE_IFELSE(

+	[AC_LANG_PROGRAM([[]], [[void __attribute__((noreturn)) panic(void);]])],

+	[AC_MSG_RESULT(yes)

+	 AC_DEFINE(HAVE_ATTRIBUTE_NORETURN, 1, Define to 1 if compiler supports __attribute__((noreturn)))],

+	[AC_MSG_RESULT(no)]

 )

 dnl Checks for libraries.

 

-- 

1.6.5.3

package/at/at-3.1.12-0003-Makefile.in-add-LDFLAGS-to-linking-stage.patch

0 → 100644
+38 −0
Original line number Diff line number Diff line 
From 8720a71757f3626bf3bbc3a7aa2185e6387e5689 Mon Sep 17 00:00:00 2001

From: Marc Kleine-Budde <mkl@pengutronix.de>

Date: Tue, 1 Dec 2009 20:37:31 +0100

Subject: [PATCH 3/5] Makefile.in: add LDFLAGS to linking stage



The linking stage ignores the LDFLAGS, this breaks if the flex library

lives in a non standard location.



This patch add LDFLAGS to both "at" and "atd" linking stage.



Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

---

 Makefile.in |    4 ++--

 1 files changed, 2 insertions(+), 2 deletions(-)



diff --git a/Makefile.in b/Makefile.in

index dae6b7d..b766bbb 100644

--- a/Makefile.in

+++ b/Makefile.in

@@ -65,13 +65,13 @@ LIST = Filelist Filelist.asc

 all: at atd atrun

 

 at: $(ATOBJECTS)

-	$(CC) $(CFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB)

+	$(CC) $(CFLAGS) $(LDFLAGS) -o at $(ATOBJECTS) $(LIBS) $(LEXLIB)

 	rm -f $(CLONES)

 	$(LN_S) -f at atq

 	$(LN_S) -f at atrm

 

 atd: $(RUNOBJECTS)

-	$(CC) $(CFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB)

+	$(CC) $(CFLAGS) $(LDFLAGS) -o atd $(RUNOBJECTS) $(LIBS) $(PAMLIB)

 

 y.tab.c y.tab.h: parsetime.y

 	$(YACC) -d parsetime.y

-- 

1.6.5.3

package/at/at-3.1.12-0005-Makefile.in-replace-IROOT-by-DESTDIR.patch

0 → 100644
+97 −0
Original line number Diff line number Diff line 
From 195d30e2e01fe2f91ed3bdaeec3982aa66b309dd Mon Sep 17 00:00:00 2001

From: Marc Kleine-Budde <mkl@pengutronix.de>

Date: Tue, 1 Dec 2009 20:57:45 +0100

Subject: [PATCH 5/5] Makefile.in: replace IROOT by DESTDIR



This patch replaces IROOT by DESTDIR, which is the autotools standard

variable. For backwards compatibilty IROOT overwrites the DESTDIR.



Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

---

 Makefile.in |   64 +++++++++++++++++++++++++++++++-----------------------------

 1 file changed, 34 insertions(+), 30 deletions(-)



Index: at-3.1.12/Makefile.in

===================================================================

--- at-3.1.12.orig/Makefile.in

+++ at-3.1.12/Makefile.in

@@ -16,6 +16,10 @@ docdir		= $(prefix)/doc

 atdocdir	= $(docdir)/at

 etcdir		= @ETCDIR@

 

+ifdef IROOT

+DESTDIR		= $(IROOT)

+endif

+

 DAEMON_USERNAME	= @DAEMON_USERNAME@

 DAEMON_GROUPNAME= @DAEMON_GROUPNAME@

 LOADAVG_MX	= @LOADAVG_MX@

@@ -86,38 +90,38 @@ atrun: atrun.in

 	$(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)

-	chmod 1770 $(IROOT)$(ATSPOOL_DIR) $(IROOT)$(ATJOB_DIR)

-	touch $(IROOT)$(LFILE)

-	chmod 600 $(IROOT)$(LFILE)

-	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)

-	$(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)/

-	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) -g root -o root -m 755 -d $(DESTDIR)$(etcdir)

+	$(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(bindir)

+	$(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(sbindir)

+	$(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(docdir)

+	$(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(atdocdir)

+	$(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR)

+	chmod 1770 $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR)

+	touch $(DESTDIR)$(LFILE)

+	chmod 600 $(DESTDIR)$(LFILE)

+	chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(DESTDIR)$(LFILE)

+	test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(DESTDIR)$(etcdir)/

+	$(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 -s at $(DESTDIR)$(bindir)

+	$(LN_S) -f at $(DESTDIR)$(bindir)/atq

+	$(LN_S) -f at $(DESTDIR)$(bindir)/atrm

+	$(INSTALL) -g root -o root -m 755 batch $(DESTDIR)$(bindir)

+	$(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man1dir)

+	$(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man5dir)

+	$(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man8dir)

+	$(INSTALL) -g root -o root -m 755 -s atd $(DESTDIR)$(sbindir)

+	$(INSTALL) -g root -o root -m 755 atrun $(DESTDIR)$(sbindir)

+	$(INSTALL) -g root -o root -m 644 at.1 $(DESTDIR)$(man1dir)/

+	cd $(DESTDIR)$(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 $(DESTDIR)$(man8dir)/

 	sed "s,\$${exec_prefix},$(exec_prefix),g" <atrun.8>tmpman

-	$(INSTALL) -g root -o root -m 644 tmpman $(IROOT)$(man8dir)/atrun.8

+	$(INSTALL) -g root -o root -m 644 tmpman $(DESTDIR)$(man8dir)/atrun.8

 	rm -f tmpman

-	$(INSTALL) -g root -o root -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)

-	rm -f $(IROOT)$(mandir)/cat1/at.1* $(IROOT)$(mandir)/cat1/batch.1* \

-		$(IROOT)$(mandir)/cat1/atq.1*

-	rm -f $(IROOT)$(mandir)/cat1/atd.8*

+	$(INSTALL) -g root -o root -m 644 at_allow.5 $(DESTDIR)$(man5dir)/

+	cd $(DESTDIR)$(man5dir) && $(LN_S) -f at_allow.5 at_deny.5 

+	$(INSTALL) -g root -o root -m 644 $(DOCS) $(DESTDIR)$(atdocdir)

+	rm -f $(DESTDIR)$(mandir)/cat1/at.1* $(DESTDIR)$(mandir)/cat1/batch.1* \

+		$(DESTDIR)$(mandir)/cat1/atq.1*

+	rm -f $(DESTDIR)$(mandir)/cat1/atd.8*

 

 dist: checkin $(DIST) $(LIST) Filelist.asc

 	(cd ..; tar cf - `for a in $(DIST) $(LIST); do echo at-$(VERSION)/$$a; done` |\