diff options
| author | Michael Forney <mforney@mforney.org> | 2016-12-11 16:04:20 -0800 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2016-12-13 23:10:30 -0800 |
| commit | 293f5a93b77d92fd65db7f3d0df654f102e46cfb (patch) | |
| tree | 6ecd1170e3dd793862dd852814dc1b4cd5e44260 /pkg/sdhcp | |
| parent | 9a506a6834df01a26795cea222b410f206efa9fa (diff) | |
Move to flat package hierarchy
Note to self: never try to move submodules again
To migrate your existing submodules (more or less):
set -x
set -e
mkdir .git/modules/pkg
for old in */*/src ; do
new="pkg/${old#*/}"
if ! [ -f "$old/.git" ] || [ "${old%%/*}" = pkg ] ; then
continue
fi
git -C ".git/modules/$old" config core.worktree "../../../../../$new"
rmdir "$new"
mv "$old" "$new"
sed -e "s,$old,$new," "$new/.git" > "$new/.git.tmp"
mv "$new/.git.tmp" "$new/.git"
mkdir ".git/modules/${new%/src}"
mv ".git/modules/$old" ".git/modules/$new"
rm "${old%/src}"/*.ninja
mv "${old%/src}"/*.tar.{gz,xz,bz2} "${new%/src}/"
rmdir "${old%/src}" || true
done
sed -e 's,^\[submodule "[^/]*/,[submodule "pkg/,' .git/config > .git/config.tmp
mv .git/config.tmp .git/config
Diffstat (limited to 'pkg/sdhcp')
| -rw-r--r-- | pkg/sdhcp/gen.rc | 9 | ||||
| -rw-r--r-- | pkg/sdhcp/patch/0001-Convert-cid-to-char-for-strlcpy.patch | 25 | ||||
| -rw-r--r-- | pkg/sdhcp/rev | 1 | ||||
| m--------- | pkg/sdhcp/src | 0 |
4 files changed, 35 insertions, 0 deletions
diff --git a/pkg/sdhcp/gen.rc b/pkg/sdhcp/gen.rc new file mode 100644 index 00000000..ca1a180f --- /dev/null +++ b/pkg/sdhcp/gen.rc @@ -0,0 +1,9 @@ +cflags\ + -Wall -Wextra -pedantic '-std=c99' \ + -D _BSD_SOURCE + +exe sdhcp sdhcp.c util/eprintf.c +file bin/sdhcp '$outdir'/sdhcp 755 +file share/man/man1/sdhcp.1 '$srcdir'/sdhcp.1 644 + +fetch git diff --git a/pkg/sdhcp/patch/0001-Convert-cid-to-char-for-strlcpy.patch b/pkg/sdhcp/patch/0001-Convert-cid-to-char-for-strlcpy.patch new file mode 100644 index 00000000..a26237db --- /dev/null +++ b/pkg/sdhcp/patch/0001-Convert-cid-to-char-for-strlcpy.patch @@ -0,0 +1,25 @@ +From 627a4c7b6869a4ba2b15308355082f39d2263b40 Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Sun, 11 Dec 2016 00:14:16 -0800 +Subject: [PATCH] Convert cid to char * for strlcpy + +--- + sdhcp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sdhcp.c b/sdhcp.c +index 5f829ad..c5f986a 100644 +--- a/sdhcp.c ++++ b/sdhcp.c +@@ -466,7 +466,7 @@ main(int argc, char *argv[]) + if (argc) + ifname = argv[0]; /* interface name */ + if (argc >= 2) +- strlcpy(cid, argv[1], sizeof(cid)); /* client-id */ ++ strlcpy((char *)cid, argv[1], sizeof(cid)); /* client-id */ + + memset(&ifreq, 0, sizeof(ifreq)); + signal(SIGALRM, nop); +-- +2.11.0 + diff --git a/pkg/sdhcp/rev b/pkg/sdhcp/rev new file mode 100644 index 00000000..0cfbf088 --- /dev/null +++ b/pkg/sdhcp/rev @@ -0,0 +1 @@ +2 diff --git a/pkg/sdhcp/src b/pkg/sdhcp/src new file mode 160000 +Subproject 450beea4e88ab7f80206741f18f0d5539ae60b4 |