diff options
author | Michael Schroeder <mls@suse.de> | 2014-07-21 15:19:58 +0200 |
---|---|---|
committer | Michael Schroeder <mls@suse.de> | 2014-07-21 15:19:58 +0200 |
commit | 1b0fe29a3e23275629295470f712f49287c25680 (patch) | |
tree | 77dda7911528592b84d8ac5ce32e8d9869bb99ed /build-recipe-livebuild | |
parent | 6743290be0e04855c936c1ef66777218a894666d (diff) |
livebuild: indentation fixes
Diffstat (limited to 'build-recipe-livebuild')
-rw-r--r-- | build-recipe-livebuild | 83 |
1 files changed, 41 insertions, 42 deletions
diff --git a/build-recipe-livebuild b/build-recipe-livebuild index db0c716..6ae7046 100644 --- a/build-recipe-livebuild +++ b/build-recipe-livebuild @@ -38,8 +38,7 @@ recipe_prepare_livebuild() { : } -createrepo_debian() -{ +createrepo_debian() { local DIR=${1} local ARCH=${2} local DIST=${3} @@ -61,15 +60,15 @@ createrepo_debian() # create Packages and Sources files mkdir -p dists/${DIST}/main/binary-${ARCH} mkdir -p dists/${DIST}/main/source - cat > ${BUILD_ROOT}/.createrepo_debian.tmp.sh <<EOF -cd /.build.binaries || exit 1 -dpkg-scanpackages -m . > dists/${DIST}/main/binary-${ARCH}/Packages -gzip -c9 < dists/${DIST}/main/binary-${ARCH}/Packages \ - > dists/${DIST}/main/binary-${ARCH}/Packages.gz -dpkg-scansources . > dists/${DIST}/main/source/Sources -gzip -c9 dists/${DIST}/main/source/Sources \ - > dists/${DIST}/main/source/Sources.gz -EOF + cat > ${BUILD_ROOT}/.createrepo_debian.tmp.sh <<-EOF + cd /.build.binaries || exit 1 + dpkg-scanpackages -m . > dists/${DIST}/main/binary-${ARCH}/Packages + gzip -c9 < dists/${DIST}/main/binary-${ARCH}/Packages \ + > dists/${DIST}/main/binary-${ARCH}/Packages.gz + dpkg-scansources . > dists/${DIST}/main/source/Sources + gzip -c9 dists/${DIST}/main/source/Sources \ + > dists/${DIST}/main/source/Sources.gz + EOF chroot $BUILD_ROOT su -c "sh /.createrepo_debian.tmp.sh" - root local RESULT=$? rm -f $BUILD_ROOT/.createrepo_debian.tmp.sh @@ -77,16 +76,16 @@ EOF # create Release file pushd dists/${DIST} >/dev/null - cat > Release <<EOF -Origin: Debian -Label: Debian -Suite: stable -Version: 7.1 -Codename: ${DIST} -Date: Sat, 15 Jun 2013 10:55:26 UTC -Description: Debian repository created by build-recipe-livebuild -Components: main -EOF + cat > Release <<-EOF + Origin: Debian + Label: Debian + Suite: stable + Version: 7.1 + Codename: ${DIST} + Date: Sat, 15 Jun 2013 10:55:26 UTC + Description: Debian repository created by build-recipe-livebuild + Components: main + EOF echo "SHA256:" >> Release for file in main/binary-${ARCH}/Packages* ; do local SUM=( $(sha256sum ${file}) ) @@ -129,25 +128,25 @@ recipe_build_livebuild() { # Write our default configuration variables mkdir -p $BUILD_ROOT/etc/live - cat > $BUILD_ROOT/etc/live/build.conf <<EOF -LB_DEBIAN_INSTALLER_DISTRIBUTION="${DIST}" -LB_DISTRIBUTION="${DIST}" -LB_PARENT_DISTRIBUTION="${DIST}" -LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${DIST}" -LB_PARENT_MIRROR_BOOTSTRAP="file:/.build.binaries/" -LB_PARENT_MIRROR_CHROOT="file:/.build.binaries/" -LB_PARENT_MIRROR_CHROOT_SECURITY="file:/.build.binaries/" -LB_PARENT_MIRROR_BINARY="file:/.build.binaries/" -LB_PARENT_MIRROR_BINARY_SECURITY="file:/.build.binaries/" -LB_PARENT_MIRROR_DEBIAN_INSTALLER="file:/.build.binaries/" -LB_MIRROR_BOOTSTRAP="file:/.build.binaries/" -LB_MIRROR_CHROOT="file:/.build.binaries/" -LB_MIRROR_CHROOT_SECURITY="file:/.build.binaries/" -LB_MIRROR_BINARY="file:/.build.binaries/" -LB_MIRROR_BINARY_SECURITY="file:/.build.binaries/" -LB_MIRROR_DEBIAN_INSTALLER="file:/.build.binaries/" -LB_APT_SECURE="false" -EOF + cat > $BUILD_ROOT/etc/live/build.conf <<-EOF + LB_DEBIAN_INSTALLER_DISTRIBUTION="${DIST}" + LB_DISTRIBUTION="${DIST}" + LB_PARENT_DISTRIBUTION="${DIST}" + LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${DIST}" + LB_PARENT_MIRROR_BOOTSTRAP="file:/.build.binaries/" + LB_PARENT_MIRROR_CHROOT="file:/.build.binaries/" + LB_PARENT_MIRROR_CHROOT_SECURITY="file:/.build.binaries/" + LB_PARENT_MIRROR_BINARY="file:/.build.binaries/" + LB_PARENT_MIRROR_BINARY_SECURITY="file:/.build.binaries/" + LB_PARENT_MIRROR_DEBIAN_INSTALLER="file:/.build.binaries/" + LB_MIRROR_BOOTSTRAP="file:/.build.binaries/" + LB_MIRROR_CHROOT="file:/.build.binaries/" + LB_MIRROR_CHROOT_SECURITY="file:/.build.binaries/" + LB_MIRROR_BINARY="file:/.build.binaries/" + LB_MIRROR_BINARY_SECURITY="file:/.build.binaries/" + LB_MIRROR_DEBIAN_INSTALLER="file:/.build.binaries/" + LB_APT_SECURE="false" + EOF # Expand live-build configuration to $TOPDIR/$LIVEBUILD_ROOT echo "Expanding live-build configuration" @@ -214,8 +213,8 @@ EOF } recipe_resultdirs_livebuild() { - # our results are already in OTHERS - echo "" + # our results are already in OTHER + : } # Local Variables: |