Skip to content
Snippets Groups Projects
Commit 038077d5 authored by Eric Vidal's avatar Eric Vidal :speech_balloon:
Browse files

rename 66-update to 66-rebuild

parent 8cf01232
No related branches found
No related tags found
No related merge requests found
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
/66-which /66-which
/66-writenv /66-writenv
/66-getenv /66-getenv
/66-update /66-rebuild
/execl-envfile /execl-envfile
/execl-subuidgid /execl-subuidgid
/config.mak /config.mak
......
...@@ -28,6 +28,7 @@ src/66/66-inservice.o src/66/66-inservice.lo: src/66/66-inservice.c src/include/ ...@@ -28,6 +28,7 @@ src/66/66-inservice.o src/66/66-inservice.lo: src/66/66-inservice.c src/include/
src/66/66-instate.o src/66/66-instate.lo: src/66/66-instate.c src/include/66/constants.h src/include/66/info.h src/include/66/resolve.h src/include/66/state.h src/include/66/utils.h src/66/66-instate.o src/66/66-instate.lo: src/66/66-instate.c src/include/66/constants.h src/include/66/info.h src/include/66/resolve.h src/include/66/state.h src/include/66/utils.h
src/66/66-intree.o src/66/66-intree.lo: src/66/66-intree.c src/include/66/backup.h src/include/66/constants.h src/include/66/enum.h src/include/66/info.h src/include/66/resolve.h src/include/66/tree.h src/include/66/utils.h src/66/66-intree.o src/66/66-intree.lo: src/66/66-intree.c src/include/66/backup.h src/include/66/constants.h src/include/66/enum.h src/include/66/info.h src/include/66/resolve.h src/include/66/tree.h src/include/66/utils.h
src/66/66-parser.o src/66/66-parser.lo: src/66/66-parser.c src/include/66/constants.h src/include/66/parser.h src/include/66/utils.h src/66/66-parser.o src/66/66-parser.lo: src/66/66-parser.c src/include/66/constants.h src/include/66/parser.h src/include/66/utils.h
src/66/66-rebuild.o src/66/66-rebuild.lo: src/66/66-rebuild.c src/include/66/backup.h src/include/66/constants.h src/include/66/db.h src/include/66/parser.h src/include/66/resolve.h src/include/66/ssexec.h src/include/66/svc.h src/include/66/tree.h src/include/66/utils.h
src/66/66-scanctl.o src/66/66-scanctl.lo: src/66/66-scanctl.c src/include/66/utils.h src/66/66-scanctl.o src/66/66-scanctl.lo: src/66/66-scanctl.c src/include/66/utils.h
src/66/66-scandir.o src/66/66-scandir.lo: src/66/66-scandir.c src/include/66/config.h src/include/66/constants.h src/include/66/utils.h src/66/66-scandir.o src/66/66-scandir.lo: src/66/66-scandir.c src/include/66/config.h src/include/66/constants.h src/include/66/utils.h
src/66/66-shutdown.o src/66/66-shutdown.lo: src/66/66-shutdown.c src/include/66/config.h src/include/66/hpr.h src/66/66-shutdown.o src/66/66-shutdown.lo: src/66/66-shutdown.c src/include/66/config.h src/include/66/hpr.h
...@@ -36,7 +37,6 @@ src/66/66-start.o src/66/66-start.lo: src/66/66-start.c src/include/66/ssexec.h ...@@ -36,7 +37,6 @@ src/66/66-start.o src/66/66-start.lo: src/66/66-start.c src/include/66/ssexec.h
src/66/66-stop.o src/66/66-stop.lo: src/66/66-stop.c src/include/66/ssexec.h src/66/66-stop.o src/66/66-stop.lo: src/66/66-stop.c src/include/66/ssexec.h
src/66/66-svctl.o src/66/66-svctl.lo: src/66/66-svctl.c src/include/66/ssexec.h src/66/66-svctl.o src/66/66-svctl.lo: src/66/66-svctl.c src/include/66/ssexec.h
src/66/66-tree.o src/66/66-tree.lo: src/66/66-tree.c src/include/66/config.h src/include/66/constants.h src/include/66/db.h src/include/66/enum.h src/include/66/resolve.h src/include/66/state.h src/include/66/tree.h src/include/66/utils.h src/66/66-tree.o src/66/66-tree.lo: src/66/66-tree.c src/include/66/config.h src/include/66/constants.h src/include/66/db.h src/include/66/enum.h src/include/66/resolve.h src/include/66/state.h src/include/66/tree.h src/include/66/utils.h
src/66/66-update.o src/66/66-update.lo: src/66/66-update.c src/include/66/backup.h src/include/66/constants.h src/include/66/db.h src/include/66/parser.h src/include/66/resolve.h src/include/66/ssexec.h src/include/66/svc.h src/include/66/tree.h src/include/66/utils.h
src/extra-tools/66-echo.o src/extra-tools/66-echo.lo: src/extra-tools/66-echo.c src/extra-tools/66-echo.o src/extra-tools/66-echo.lo: src/extra-tools/66-echo.c
src/extra-tools/66-nuke.o src/extra-tools/66-nuke.lo: src/extra-tools/66-nuke.c src/extra-tools/66-nuke.o src/extra-tools/66-nuke.lo: src/extra-tools/66-nuke.c
src/extra-tools/66-umountall.o src/extra-tools/66-umountall.lo: src/extra-tools/66-umountall.c src/include/66/config.h src/extra-tools/66-umountall.o src/extra-tools/66-umountall.lo: src/extra-tools/66-umountall.c src/include/66/config.h
...@@ -104,13 +104,13 @@ src/lib66/tree_switch_current.o src/lib66/tree_switch_current.lo: src/lib66/tree ...@@ -104,13 +104,13 @@ src/lib66/tree_switch_current.o src/lib66/tree_switch_current.lo: src/lib66/tree
66-disable: src/66/66-disable.o ${LIB66} 66-disable: src/66/66-disable.o ${LIB66}
66-enable: EXTRA_LIBS := -ls6rc -ls6 -loblibs -lskarnet 66-enable: EXTRA_LIBS := -ls6rc -ls6 -loblibs -lskarnet
66-enable: src/66/66-enable.o ${LIB66} 66-enable: src/66/66-enable.o ${LIB66}
66-env: EXTRA_LIBS := -loblibs -lskarnet 66-env: EXTRA_LIBS := -ls6rc -ls6 -loblibs -lskarnet
66-env: src/66/66-env.o ${LIB66} 66-env: src/66/66-env.o ${LIB66}
66-hpr: EXTRA_LIBS := -loblibs -lskarnet ${SYSCLOCK_LIB} ${SOCKET_LIB} 66-hpr: EXTRA_LIBS := -loblibs -lskarnet ${SYSCLOCK_LIB} ${SOCKET_LIB}
66-hpr: src/66/66-hpr.o ${LIB66} ${LIBUTMPS} 66-hpr: src/66/66-hpr.o ${LIB66} ${LIBUTMPS}
66-info: EXTRA_LIBS := -ls6 -loblibs -lskarnet 66-info: EXTRA_LIBS := -ls6 -loblibs -lskarnet
66-info: src/66/66-info.o ${LIB66} 66-info: src/66/66-info.o ${LIB66}
66-init: EXTRA_LIBS := -ls6 -loblibs -lskarnet 66-init: EXTRA_LIBS := -ls6rc -ls6 -loblibs -lskarnet
66-init: src/66/66-init.o ${LIB66} 66-init: src/66/66-init.o ${LIB66}
66-inresolve: EXTRA_LIBS := -loblibs -lskarnet 66-inresolve: EXTRA_LIBS := -loblibs -lskarnet
66-inresolve: src/66/66-inresolve.o ${LIB66} 66-inresolve: src/66/66-inresolve.o ${LIB66}
...@@ -122,6 +122,8 @@ src/lib66/tree_switch_current.o src/lib66/tree_switch_current.lo: src/lib66/tree ...@@ -122,6 +122,8 @@ src/lib66/tree_switch_current.o src/lib66/tree_switch_current.lo: src/lib66/tree
66-intree: src/66/66-intree.o ${LIB66} 66-intree: src/66/66-intree.o ${LIB66}
66-parser: EXTRA_LIBS := -loblibs -lskarnet 66-parser: EXTRA_LIBS := -loblibs -lskarnet
66-parser: src/66/66-parser.o ${LIB66} 66-parser: src/66/66-parser.o ${LIB66}
66-rebuild: EXTRA_LIBS := -ls6rc -ls6 -loblibs -lskarnet
66-rebuild: src/66/66-rebuild.o ${LIB66}
66-scanctl: EXTRA_LIBS := -ls6 -loblibs -lskarnet 66-scanctl: EXTRA_LIBS := -ls6 -loblibs -lskarnet
66-scanctl: src/66/66-scanctl.o ${LIB66} 66-scanctl: src/66/66-scanctl.o ${LIB66}
66-scandir: EXTRA_LIBS := -ls6 -loblibs -lskarnet 66-scandir: EXTRA_LIBS := -ls6 -loblibs -lskarnet
...@@ -134,12 +136,10 @@ src/lib66/tree_switch_current.o src/lib66/tree_switch_current.lo: src/lib66/tree ...@@ -134,12 +136,10 @@ src/lib66/tree_switch_current.o src/lib66/tree_switch_current.lo: src/lib66/tree
66-start: src/66/66-start.o ${LIB66} 66-start: src/66/66-start.o ${LIB66}
66-stop: EXTRA_LIBS := -ls6rc -ls6 -loblibs -lskarnet 66-stop: EXTRA_LIBS := -ls6rc -ls6 -loblibs -lskarnet
66-stop: src/66/66-stop.o ${LIB66} 66-stop: src/66/66-stop.o ${LIB66}
66-svctl: EXTRA_LIBS := -ls6 -loblibs -lskarnet ${SYSCLOCK_LIB} 66-svctl: EXTRA_LIBS := -ls6rc -ls6 -loblibs -lskarnet ${SYSCLOCK_LIB}
66-svctl: src/66/66-svctl.o ${LIB66} 66-svctl: src/66/66-svctl.o ${LIB66}
66-tree: EXTRA_LIBS := -ls6rc -ls6 -loblibs -lskarnet ${SPAWN_LIB} 66-tree: EXTRA_LIBS := -ls6rc -ls6 -loblibs -lskarnet ${SPAWN_LIB}
66-tree: src/66/66-tree.o ${LIB66} 66-tree: src/66/66-tree.o ${LIB66}
66-update: EXTRA_LIBS := -ls6rc -ls6 -loblibs -lskarnet
66-update: src/66/66-update.o ${LIB66}
66-echo: EXTRA_LIBS := -loblibs -lskarnet 66-echo: EXTRA_LIBS := -loblibs -lskarnet
66-echo: src/extra-tools/66-echo.o 66-echo: src/extra-tools/66-echo.o
66-nuke: EXTRA_LIBS := 66-nuke: EXTRA_LIBS :=
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
66-shutdown 0755 66-shutdown 0755
66-shutdownd 0755 66-shutdownd 0755
66-hpr 0755 66-hpr 0755
66-update 0755 66-rebuild 0755
66-umountall 0755 66-umountall 0755
66-echo 0755 66-echo 0755
66-nuke 0755 66-nuke 0755
......
...@@ -20,7 +20,7 @@ BIN_TARGETS := \ ...@@ -20,7 +20,7 @@ BIN_TARGETS := \
66-shutdown \ 66-shutdown \
66-shutdownd \ 66-shutdownd \
66-hpr \ 66-hpr \
66-update \ 66-rebuild \
66-umountall \ 66-umountall \
66-echo \ 66-echo \
execl-envfile \ execl-envfile \
......
/* /*
* 66-update.c * 66-rebuild.c
* *
* Copyright (c) 2018-2021 Eric Vidal <eric@obarun.org> * Copyright (c) 2018-2021 Eric Vidal <eric@obarun.org>
* *
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include <66/resolve.h> #include <66/resolve.h>
#include <66/parser.h> #include <66/parser.h>
#define USAGE "66-update [ -h ] [ -z ] [ -v verbosity ] [ -l live ] [ -d ] tree(s)" #define USAGE "66-rebuild [ -h ] [ -z ] [ -v verbosity ] [ -l live ] [ -d ] tree(s)"
static stralloc WORKDIR = STRALLOC_ZERO ; static stralloc WORKDIR = STRALLOC_ZERO ;
static uint8_t DRYRUN = 0 ; static uint8_t DRYRUN = 0 ;
...@@ -269,7 +269,7 @@ int main(int argc, char const *const *argv,char const *const *envp) ...@@ -269,7 +269,7 @@ int main(int argc, char const *const *argv,char const *const *envp)
stralloc tree_enabled = STRALLOC_ZERO ; stralloc tree_enabled = STRALLOC_ZERO ;
ssexec_t info = SSEXEC_ZERO ; ssexec_t info = SSEXEC_ZERO ;
PROG = "66-update" ; PROG = "66-rebuild" ;
{ {
subgetopt_t l = SUBGETOPT_ZERO ; subgetopt_t l = SUBGETOPT_ZERO ;
for (;;) for (;;)
...@@ -543,7 +543,7 @@ int main(int argc, char const *const *argv,char const *const *envp) ...@@ -543,7 +543,7 @@ int main(int argc, char const *const *argv,char const *const *envp)
cleanup() ; cleanup() ;
log_info(DRYRUN ? drun : "","tree: ",info.treename.s," updated successfully") ; log_info(DRYRUN ? drun : "","tree: ",info.treename.s," rebuild successfully") ;
} }
exit: exit:
stralloc_free(&satree) ; stralloc_free(&satree) ;
......
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment