diff options
author | Michal Marek <mmarek@suse.cz> | 2014-06-18 10:21:41 -0400 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2014-06-18 11:34:59 -0400 |
commit | c7eb3a7a1790e0a3a063b4183894d0d63ffee431 (patch) | |
tree | 6ae3488fc80205b76e5c937b16ad07f363ee4daf /scripts | |
parent | a765a7ce293aa0a072728790ce11088b2f7030e2 (diff) |
kbuild: Fix tar-pkg with relative $(objtree)
Commit 7e1c0477 (kbuild: Use relative path for $(objtree)) assumes that
the build process does not change its working directory. make tar-pkg
was a couterexample, fix this by changing directory only for the tar
command and not for the whole script, which at one point references the
now relative $(objtree).
Reported-and-tested-by: "J. Bruce Fields" <bfields@fieldses.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/package/buildtar | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/package/buildtar b/scripts/package/buildtar index 995c1eafaff6..e046bff33589 100644 --- a/scripts/package/buildtar +++ b/scripts/package/buildtar | |||
@@ -125,12 +125,11 @@ esac | |||
125 | # Create the tarball | 125 | # Create the tarball |
126 | # | 126 | # |
127 | ( | 127 | ( |
128 | cd "${tmpdir}" | ||
129 | opts= | 128 | opts= |
130 | if tar --owner=root --group=root --help >/dev/null 2>&1; then | 129 | if tar --owner=root --group=root --help >/dev/null 2>&1; then |
131 | opts="--owner=root --group=root" | 130 | opts="--owner=root --group=root" |
132 | fi | 131 | fi |
133 | tar cf - boot/* lib/* $opts | ${compress} > "${tarball}${file_ext}" | 132 | tar cf - -C "$tmpdir" boot/ lib/ $opts | ${compress} > "${tarball}${file_ext}" |
134 | ) | 133 | ) |
135 | 134 | ||
136 | echo "Tarball successfully created in ${tarball}${file_ext}" | 135 | echo "Tarball successfully created in ${tarball}${file_ext}" |