1 |
commit: bd95b086759a6444569e1a094d250dc14f2d9d7e |
2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jun 27 23:58:05 2012 +0000 |
4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 27 23:58:05 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=bd95b086 |
7 |
|
8 |
Fix whitespace. |
9 |
|
10 |
--- |
11 |
tools/catalyst-auto-amd64.conf | 56 ++++++++++++++++++++-------------------- |
12 |
tools/catalyst-auto-x86.conf | 56 ++++++++++++++++++++-------------------- |
13 |
2 files changed, 56 insertions(+), 56 deletions(-) |
14 |
|
15 |
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf |
16 |
index 502dc2d..9131974 100644 |
17 |
--- a/tools/catalyst-auto-amd64.conf |
18 |
+++ b/tools/catalyst-auto-amd64.conf |
19 |
@@ -30,40 +30,40 @@ BUILD_SRCDIR_BASE=${BASE_DIR}/buildroot/${ARCH}-dev/builds/ |
20 |
BUILD_DESTDIR_BASE=/home/buildsync/builds/${ARCH}/ |
21 |
|
22 |
give_latest_from_dates() { |
23 |
- sed 's,-20,~20,g' | \ |
24 |
- sort -k +1 -n -t '~' |\ |
25 |
- awk -F\~ \ |
26 |
- 'BEGIN{i=$1; o=$0}; |
27 |
- { if($1 != i && i != "") { print o; }; i=$1; o=$0; } |
28 |
- END { print o; };' | \ |
29 |
- tr '~' '-' |
30 |
+ sed 's,-20,~20,g' | \ |
31 |
+ sort -k +1 -n -t '~' |\ |
32 |
+ awk -F\~ \ |
33 |
+ 'BEGIN{i=$1; o=$0}; |
34 |
+ { if($1 != i && i != "") { print o; }; i=$1; o=$0; } |
35 |
+ END { print o; };' | \ |
36 |
+ tr '~' '-' |
37 |
} |
38 |
|
39 |
pre_build() { |
40 |
- pushd ${REPO_DIR} |
41 |
- git pull |
42 |
- popd |
43 |
- # Symlink the latest stages3 to build from |
44 |
- for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do |
45 |
- cd $d |
46 |
- for f in $(ls 'stage3*bz2' | give_latest_from_dates ) ; do |
47 |
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff |
48 |
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff |
49 |
- ln -sf $f $of |
50 |
- done |
51 |
- done |
52 |
+ pushd ${REPO_DIR} |
53 |
+ git pull |
54 |
+ popd |
55 |
+ # Symlink the latest stages3 to build from |
56 |
+ for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do |
57 |
+ cd $d |
58 |
+ for f in $(ls 'stage3*bz2' | give_latest_from_dates ) ; do |
59 |
+ of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff |
60 |
+ of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff |
61 |
+ ln -sf $f $of |
62 |
+ done |
63 |
+ done |
64 |
} |
65 |
|
66 |
post_build() { |
67 |
- cd ${BUILD_SRCDIR_BASE}/default |
68 |
- cp stage3-*${DATESTAMP}*bz2* ${BUILD_DESTDIR_BASE}/ |
69 |
- if [ -n "$(ls -1 *${DATESTAMP}*.iso* 2>/dev/null)" ]; then |
70 |
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/ |
71 |
- fi |
72 |
- cd ${BUILD_SRCDIR_BASE}/hardened |
73 |
- if [ -n "$(ls -1 stage3-*${DATESTAMP}*.bz2.* 2>/dev/null)" ]; then |
74 |
- cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/ |
75 |
- fi |
76 |
+ cd ${BUILD_SRCDIR_BASE}/default |
77 |
+ cp stage3-*${DATESTAMP}*bz2* ${BUILD_DESTDIR_BASE}/ |
78 |
+ if [ -n "$(ls -1 *${DATESTAMP}*.iso* 2>/dev/null)" ]; then |
79 |
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/ |
80 |
+ fi |
81 |
+ cd ${BUILD_SRCDIR_BASE}/hardened |
82 |
+ if [ -n "$(ls -1 stage3-*${DATESTAMP}*.bz2.* 2>/dev/null)" ]; then |
83 |
+ cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/ |
84 |
+ fi |
85 |
} |
86 |
|
87 |
# vim:ft=sh: |
88 |
|
89 |
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf |
90 |
index e7f48be..41d0acf 100644 |
91 |
--- a/tools/catalyst-auto-x86.conf |
92 |
+++ b/tools/catalyst-auto-x86.conf |
93 |
@@ -28,40 +28,40 @@ BUILD_SRCDIR_BASE=${BASE_DIR}/buildroot/${ARCH}-dev/builds/ |
94 |
BUILD_DESTDIR_BASE=/home/buildsync/builds/${ARCH}/ |
95 |
|
96 |
give_latest_from_dates() { |
97 |
- sed 's,-20,~20,g' | \ |
98 |
- sort -k +1 -n -t '~' |\ |
99 |
- awk -F\~ \ |
100 |
- 'BEGIN{i=$1; o=$0}; |
101 |
- { if($1 != i && i != "") { print o; }; i=$1; o=$0; } |
102 |
- END { print o; };' | \ |
103 |
- tr '~' '-' |
104 |
+ sed 's,-20,~20,g' | \ |
105 |
+ sort -k +1 -n -t '~' |\ |
106 |
+ awk -F\~ \ |
107 |
+ 'BEGIN{i=$1; o=$0}; |
108 |
+ { if($1 != i && i != "") { print o; }; i=$1; o=$0; } |
109 |
+ END { print o; };' | \ |
110 |
+ tr '~' '-' |
111 |
} |
112 |
|
113 |
pre_build() { |
114 |
- pushd ${REPO_DIR} |
115 |
- git pull |
116 |
- popd |
117 |
- # Symlink the latest stages3 to build from |
118 |
- for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do |
119 |
- cd $d |
120 |
- for f in $(ls 'stage3*bz2' | give_latest_from_dates ) ; do |
121 |
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff |
122 |
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff |
123 |
- ln -sf $f $of |
124 |
- done |
125 |
- done |
126 |
+ pushd ${REPO_DIR} |
127 |
+ git pull |
128 |
+ popd |
129 |
+ # Symlink the latest stages3 to build from |
130 |
+ for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do |
131 |
+ cd $d |
132 |
+ for f in $(ls 'stage3*bz2' | give_latest_from_dates ) ; do |
133 |
+ of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff |
134 |
+ of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff |
135 |
+ ln -sf $f $of |
136 |
+ done |
137 |
+ done |
138 |
} |
139 |
|
140 |
post_build() { |
141 |
- cd ${BUILD_SRCDIR_BASE}/default |
142 |
- cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE} |
143 |
- if [ -n "$(ls -1 *${DATESTAMP}*.iso* 2>/dev/null)" ]; then |
144 |
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/ |
145 |
- fi |
146 |
- cd ${BUILD_SRCDIR_BASE}/hardened |
147 |
- if [ -n "$(ls -1 stage3-i686-*${DATESTAMP}*.bz2* 2>/dev/null)" ]; then |
148 |
- cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/ |
149 |
- fi |
150 |
+ cd ${BUILD_SRCDIR_BASE}/default |
151 |
+ cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE} |
152 |
+ if [ -n "$(ls -1 *${DATESTAMP}*.iso* 2>/dev/null)" ]; then |
153 |
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/ |
154 |
+ fi |
155 |
+ cd ${BUILD_SRCDIR_BASE}/hardened |
156 |
+ if [ -n "$(ls -1 stage3-i686-*${DATESTAMP}*.bz2* 2>/dev/null)" ]; then |
157 |
+ cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/ |
158 |
+ fi |
159 |
} |
160 |
|
161 |
# vim:ft=sh: |