This commit is contained in:
parent
dffb94a35a
commit
3ae0f88481
@ -1,5 +1,5 @@
|
||||
--- makeboot.c
|
||||
+++ makeboot.c 2009-01-27 16:56:43.184201291 +0100
|
||||
+++ makeboot.c 2009/02/05 23:36:16
|
||||
@@ -13,6 +13,12 @@
|
||||
#include <errno.h>
|
||||
#include <limits.h>
|
||||
@ -13,7 +13,15 @@
|
||||
|
||||
|
||||
int tree_entries = 0;
|
||||
@@ -103,6 +109,8 @@ static int check_loop(struct makenode *d
|
||||
@@ -95,6 +101,7 @@
|
||||
/*
|
||||
* check whether the given target would create an infinte loop
|
||||
*/
|
||||
+static int loop;
|
||||
static int check_loop(struct makenode *dep, struct makenode *src)
|
||||
{
|
||||
struct makelist *s;
|
||||
@@ -103,6 +110,8 @@
|
||||
fprintf(stderr, "loop exists %s in %s!\n", dep->name, src->name);
|
||||
return 1;
|
||||
}
|
||||
@ -22,13 +30,7 @@
|
||||
if (check_loop(s->node, src))
|
||||
return 1;
|
||||
}
|
||||
@@ -112,11 +120,13 @@ static int check_loop(struct makenode *d
|
||||
/*
|
||||
* add to the dependecy and selection lists
|
||||
*/
|
||||
+static int loop;
|
||||
static void add_depend(struct makenode *node, const char *dst)
|
||||
{
|
||||
@@ -117,6 +126,7 @@
|
||||
struct makenode *dep;
|
||||
|
||||
dep = add_target(dst);
|
||||
@ -36,7 +38,7 @@
|
||||
if (check_loop(dep, node))
|
||||
return;
|
||||
dep->select = new_list(node, dep->select);
|
||||
@@ -158,11 +168,28 @@ void parse_makefile(const char *path)
|
||||
@@ -158,11 +168,28 @@
|
||||
char *s, *strp, *p;
|
||||
struct makenode *node;
|
||||
|
||||
@ -67,7 +69,7 @@
|
||||
while (fgets(buf, sizeof(buf), fp)) {
|
||||
for (s = buf; *s && isspace(*s); s++)
|
||||
;
|
||||
@@ -198,6 +225,11 @@ void parse_makefile(const char *path)
|
||||
@@ -198,6 +225,11 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -79,7 +81,7 @@
|
||||
fclose(fp);
|
||||
|
||||
for (node = tree_list; node; node = node->next) {
|
||||
@@ -234,7 +266,17 @@ static void filter_files(const char *dir
|
||||
@@ -234,7 +266,17 @@
|
||||
|
||||
filter_prefix = prefix;
|
||||
snprintf(path, sizeof(path), "/etc/init.d/%s.d", dir);
|
||||
@ -97,7 +99,7 @@
|
||||
/* mark all matching nodes */
|
||||
for (i = 0; i < ndirs; i++) {
|
||||
t = lookup_target(dirlist[i]->d_name + 3);
|
||||
@@ -342,6 +384,17 @@ struct makenode *pickup_task(void)
|
||||
@@ -342,6 +384,17 @@
|
||||
}
|
||||
}
|
||||
if (best) {
|
||||
@ -115,7 +117,7 @@
|
||||
blogger("service %s", best->name);
|
||||
best->status = T_RUNNING;
|
||||
}
|
||||
@@ -359,6 +412,17 @@ void finish_task(struct makenode *node)
|
||||
@@ -359,6 +412,17 @@
|
||||
return;
|
||||
for (n = node->select; n; n = n->next)
|
||||
n->node->num_deps--;
|
||||
|
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 6 00:36:27 CET 2009 - ro@suse.de
|
||||
|
||||
- fix build (move static int loop before first usage)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 27 16:00:03 CET 2009 - werner@suse.de
|
||||
|
||||
|
@ -30,7 +30,7 @@ Group: System/Base
|
||||
PreReq: coreutils
|
||||
AutoReqProv: on
|
||||
Version: 2.86
|
||||
Release: 190
|
||||
Release: 193
|
||||
Summary: SysV-Style init
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: libselinux-devel libsepol-devel
|
||||
@ -321,6 +321,8 @@ rm -rf ${RPM_BUILD_ROOT}
|
||||
%doc %{_mandir}/man8/mkill.8.gz
|
||||
|
||||
%changelog
|
||||
* Fri Feb 06 2009 ro@suse.de
|
||||
- fix build (move static int loop before first usage)
|
||||
* Tue Jan 27 2009 werner@suse.de
|
||||
- Do not terminate udevd with mkill(8)
|
||||
- Do not terminate udevd with killall5(8)
|
||||
|
Loading…
Reference in New Issue
Block a user