diff options
author | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
---|---|---|
committer | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
commit | f96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch) | |
tree | edb17ec2c4ea13c5acb1c7350957a249a820e28d /cron | |
parent | b6588aa6851fb220cedc387d21c51513ef8d67f4 (diff) |
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'cron')
-rw-r--r-- | cron/cron-3.0pl1/nonrootinstall.patch | 28 | ||||
-rw-r--r-- | cron/cron-3.0pl1/time.patch | 16 |
2 files changed, 44 insertions, 0 deletions
diff --git a/cron/cron-3.0pl1/nonrootinstall.patch b/cron/cron-3.0pl1/nonrootinstall.patch index e69de29bb2..375862d905 100644 --- a/cron/cron-3.0pl1/nonrootinstall.patch +++ b/cron/cron-3.0pl1/nonrootinstall.patch @@ -0,0 +1,28 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- cron3.0pl1/Makefile~nonrootinstall ++++ cron3.0pl1/Makefile +@@ -77,6 +77,9 @@ + #<<the name of the BSD-like install program>> + #INSTALL = installbsd + INSTALL = install ++ifeq ($(DESTDIR),) ++INSTALLOWN = -o root ++endif + #<<any special load flags>> + LDFLAGS = + #################################### end configurable stuff +@@ -113,8 +116,8 @@ + $(CC) $(LDFLAGS) -o crontab $(CRONTAB_OBJ) $(LIBS) + + install : all +- $(INSTALL) -c -m 111 -o root -s cron $(DESTSBIN)/ +- $(INSTALL) -c -m 4111 -o root -s crontab $(DESTBIN)/ ++ $(INSTALL) -c -m 111 $(INSTALLOWN) -s cron $(DESTSBIN)/ ++ $(INSTALL) -c -m 4111 $(INSTALLOWN) -s crontab $(DESTBIN)/ + sh putman.sh crontab.1 $(DESTMAN) + sh putman.sh cron.8 $(DESTMAN) + sh putman.sh crontab.5 $(DESTMAN) diff --git a/cron/cron-3.0pl1/time.patch b/cron/cron-3.0pl1/time.patch index e69de29bb2..c172984a85 100644 --- a/cron/cron-3.0pl1/time.patch +++ b/cron/cron-3.0pl1/time.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- cron3.0pl1/compat.h~time ++++ cron3.0pl1/compat.h +@@ -114,7 +114,7 @@ + # define USE_SIGCHLD + #endif + +-#if !defined(AIX) && !defined(UNICOS) ++#if !defined(AIX) && !defined(UNICOS) && !defined(__linux) + # define SYS_TIME_H 1 + #else + # define SYS_TIME_H 0 |