Skip to content

Commit

Permalink
Add TOPDIR cleanup back to build-recipe-kiwi
Browse files Browse the repository at this point in the history
This brings it in sync with all of the other recipe handlers.
We create the dirs needed for rpmbuild for compatibility reasons.
  • Loading branch information
mlschroe committed Jun 16, 2016
1 parent 751c6c5 commit ebd4695
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions build-recipe-kiwi
Original file line number Diff line number Diff line change
Expand Up @@ -259,10 +259,16 @@ kiwi_post_unknown() {

recipe_setup_kiwi() {
TOPDIR=/usr/src/packages
test "$DO_INIT_TOPDIR" = false || rm -rf "$BUILD_ROOT$TOPDIR"
mkdir -p "$BUILD_ROOT$TOPDIR"
mkdir -p "$BUILD_ROOT$TOPDIR/OTHER"
mkdir -p "$BUILD_ROOT$TOPDIR/SOURCES"
mkdir -p "$BUILD_ROOT$TOPDIR/KIWI"
# compat, older build versions did not clean TOPDIR ...
mkdir -p "$BUILD_ROOT$TOPDIR/BUILD
mkdir -p "$BUILD_ROOT$TOPDIR/RPMS
mkdir -p "$BUILD_ROOT$TOPDIR/SRPMS

chown -R "$ABUILD_UID:$ABUILD_GID" "$BUILD_ROOT$TOPDIR"
if test "$MYSRCDIR" = $BUILD_ROOT/.build-srcdir ; then
mv "$MYSRCDIR"/* $BUILD_ROOT$TOPDIR/SOURCES/
Expand Down

0 comments on commit ebd4695

Please sign in to comment.