Skip to content

Commit

Permalink
kbuild: Fix tar-pkg with relative $(objtree)
Browse files Browse the repository at this point in the history
Commit 7e1c047 (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>
  • Loading branch information
Michal Marek committed Jun 18, 2014
1 parent a765a7c commit c7eb3a7
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions scripts/package/buildtar
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,11 @@ esac
# Create the tarball
#
(
cd "${tmpdir}"
opts=
if tar --owner=root --group=root --help >/dev/null 2>&1; then
opts="--owner=root --group=root"
fi
tar cf - boot/* lib/* $opts | ${compress} > "${tarball}${file_ext}"
tar cf - -C "$tmpdir" boot/ lib/ $opts | ${compress} > "${tarball}${file_ext}"
)

echo "Tarball successfully created in ${tarball}${file_ext}"
Expand Down

0 comments on commit c7eb3a7

Please sign in to comment.