Relocate crontabs to stx-integ/base/crontabs
Move content from stx-gplv3 into stx-integ Packages will be relocated to stx-integ: base/ anaconda crontabs dnsmasq rsync database/ python-psycopg2 filesystem/ parted grub/ grub2 security/ python-keyring Change-Id: I4733c50400c35ad4ffc1a492538a492bbe6d1255 Story: 2002801 Task: 22687 Signed-off-by: Scott Little <scott.little@windriver.com>
This commit is contained in:
parent
7c1d49e356
commit
3ef810dbb4
1
base/crontabs/centos/build_srpm.data
Normal file
1
base/crontabs/centos/build_srpm.data
Normal file
@ -0,0 +1 @@
|
||||
TIS_PATCH_VER=2
|
@ -0,0 +1,25 @@
|
||||
From a15d83975ed19367767e18354ea07cd5d281e265 Mon Sep 17 00:00:00 2001
|
||||
From: Don Penney <don.penney@windriver.com>
|
||||
Date: Tue, 27 Sep 2016 10:14:02 -0400
|
||||
Subject: [PATCH] Update package versioning for TIS format
|
||||
|
||||
---
|
||||
SPECS/crontabs.spec | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/SPECS/crontabs.spec b/SPECS/crontabs.spec
|
||||
index 7001d1a..4512bcc 100644
|
||||
--- a/SPECS/crontabs.spec
|
||||
+++ b/SPECS/crontabs.spec
|
||||
@@ -2,7 +2,7 @@
|
||||
Summary: Root crontab files used to schedule the execution of programs
|
||||
Name: crontabs
|
||||
Version: 1.11
|
||||
-Release: 6.%{snap_release}%{?dist}
|
||||
+Release: 6.%{snap_release}.el7%{?_tis_dist}.%{tis_patch_ver}
|
||||
License: Public Domain and GPLv2
|
||||
Group: System Environment/Base
|
||||
URL: https://fedorahosted.org/crontabs
|
||||
--
|
||||
1.8.3.1
|
||||
|
2
base/crontabs/centos/meta_patches/PATCH_ORDER
Normal file
2
base/crontabs/centos/meta_patches/PATCH_ORDER
Normal file
@ -0,0 +1,2 @@
|
||||
spec-add-patch-to-remove-printing-of-motd-script-nam.patch
|
||||
0001-Update-package-versioning-for-TIS-format.patch
|
@ -0,0 +1,35 @@
|
||||
From 9221bd11aec1590df2dc3f19e9a582d76ed7adc0 Mon Sep 17 00:00:00 2001
|
||||
From: Michel Thebeau <michel.thebeau@windriver.com>
|
||||
Date: Mon, 25 Jul 2016 11:45:55 -0400
|
||||
Subject: [PATCH] spec: add patch to remove printing of motd script name
|
||||
|
||||
Signed-off-by: Michel Thebeau <michel.thebeau@windriver.com>
|
||||
---
|
||||
SPECS/crontabs.spec | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/SPECS/crontabs.spec b/SPECS/crontabs.spec
|
||||
index d6a8c69..90098e1 100644
|
||||
--- a/SPECS/crontabs.spec
|
||||
+++ b/SPECS/crontabs.spec
|
||||
@@ -10,6 +10,8 @@ Source0: https://fedorahosted.org/releases/c/r/crontabs/%{name}-%{version}-1.%{s
|
||||
BuildArch: noarch
|
||||
Requires: /etc/cron.d
|
||||
|
||||
+Patch1: run-parts-add-option-to-remove-printing-of-motd-scri.patch
|
||||
+
|
||||
%description
|
||||
This package is used by Fedora mainly for executing files by cron.
|
||||
|
||||
@@ -25,6 +27,8 @@ your system.
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
+%patch1 -p1
|
||||
+
|
||||
%build
|
||||
#empty
|
||||
|
||||
--
|
||||
1.8.3.1
|
||||
|
@ -0,0 +1,65 @@
|
||||
From f0bd54cb83ba430ef81153c7a6da2a52daca5266 Mon Sep 17 00:00:00 2001
|
||||
From: Michel Thebeau <michel.thebeau@windriver.com>
|
||||
Date: Mon, 25 Jul 2016 11:23:18 -0400
|
||||
Subject: [PATCH] run-parts: add option to remove printing of motd script name
|
||||
|
||||
The awk statement seems to be a round-about way of printing the name of
|
||||
the motd script (/etc/motd.d/*). The pipe seems to allow awk to print
|
||||
without user input; while the end of input causes awk to exit. Any
|
||||
input to awk is echoed to terminal before the motd script name is
|
||||
printed.
|
||||
|
||||
The script name that is printed is appended to /etc/motd. This is
|
||||
undesirable. Add an option to skip the awk program.
|
||||
|
||||
Signed-off-by: Michel Thebeau <michel.thebeau@windriver.com>
|
||||
---
|
||||
run-parts | 25 +++++++++++++++++++------
|
||||
1 file changed, 19 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/run-parts b/run-parts
|
||||
index 7e148f8..b444f4e 100755
|
||||
--- a/run-parts
|
||||
+++ b/run-parts
|
||||
@@ -4,6 +4,14 @@
|
||||
# keep going when something fails
|
||||
set +e
|
||||
|
||||
+# First parameter to remove printing of the names of executed scripts.
|
||||
+# The default is unmodified behaviour, print the name of scripts.
|
||||
+with_progname="y"
|
||||
+if [ "$1" == "--without-progname" ]; then
|
||||
+ with_progname=""
|
||||
+ shift
|
||||
+fi
|
||||
+
|
||||
if [ $# -lt 1 ]; then
|
||||
echo "Usage: run-parts [--list | --test] <dir>"
|
||||
exit 1
|
||||
@@ -87,12 +95,17 @@ for i in $(LC_ALL=C; echo ${1%/}/*[^~,]) ; do
|
||||
|
||||
# run executable files
|
||||
logger -p cron.notice -t "run-parts($1)[$$]" "starting $(basename $i)"
|
||||
- $i 2>&1 | awk -v "progname=$i" \
|
||||
- 'progname {
|
||||
- print progname ":\n"
|
||||
- progname="";
|
||||
- }
|
||||
- { print; }'
|
||||
+ if [ -n "$with_progname" ]; then
|
||||
+ $i 2>&1 | awk -v "progname=$i" \
|
||||
+ 'progname {
|
||||
+ print progname ":\n"
|
||||
+ progname="";
|
||||
+ }
|
||||
+ { print; }'
|
||||
+ else
|
||||
+ $i 2>&1
|
||||
+ fi
|
||||
+
|
||||
logger -i -p cron.notice -t "run-parts($1)" "finished $(basename $i)"
|
||||
fi
|
||||
fi
|
||||
--
|
||||
1.8.3.1
|
||||
|
1
base/crontabs/centos/srpm_path
Normal file
1
base/crontabs/centos/srpm_path
Normal file
@ -0,0 +1 @@
|
||||
mirror:Source/crontabs-1.11-6.20121102git.el7.src.rpm
|
@ -140,3 +140,4 @@ filesystem/drbd/drbd-tools
|
||||
database/mariadb
|
||||
networking/iptables
|
||||
database/python-psycopg2
|
||||
base/crontabs
|
||||
|
Loading…
Reference in New Issue
Block a user