Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (d2a55e31dd73d524c703b8dc8053d845788dc825)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (d2a55e31dd73d524c703b8dc8053d845788dc825)
  • Date: Tue, 23 May 2017 19:19:23 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

disk/btrfs-progs/HISTORY | 3 +++
disk/btrfs-progs/PRE_BUILD | 36 +++++++++++++++++++-----------------
2 files changed, 22 insertions(+), 17 deletions(-)

New commits:
commit d2a55e31dd73d524c703b8dc8053d845788dc825
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

disk/btrfs-progs: fixed unpacking of the scm branch

diff --git a/disk/btrfs-progs/HISTORY b/disk/btrfs-progs/HISTORY
index e5118fe..e7ebbcd 100644
--- a/disk/btrfs-progs/HISTORY
+++ b/disk/btrfs-progs/HISTORY
@@ -1,3 +1,6 @@
+2017-05-23 Pavel Vinogradov <public AT sourcemage.org>
+ * PRE_BUILD: fixed the scm branch
+
2017-05-22 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 4.11
Source matches upstream has per
https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc
diff --git a/disk/btrfs-progs/PRE_BUILD b/disk/btrfs-progs/PRE_BUILD
index e86337e..c059714 100755
--- a/disk/btrfs-progs/PRE_BUILD
+++ b/disk/btrfs-progs/PRE_BUILD
@@ -1,22 +1,24 @@
-mk_source_dir "${SOURCE_DIRECTORY}" &&
-# Make sure our target doesn't exist before uncompressing
-if [[ -f "${SOURCE_CACHE}/${SOURCE/.xz}" ]]; then
- rm "${SOURCE_CACHE}/${SOURCE/.xz}"
-fi &&
-unxz -k "${SOURCE_CACHE}/${SOURCE}" &&
+if [[ "${BTRFS_PROGS_BRANCH}" != scm ]]; then
+ mk_source_dir "${SOURCE_DIRECTORY}" &&
+ # Make sure our target doesn't exist before uncompressing
+ if [[ -f "${SOURCE_CACHE}/${SOURCE/.xz}" ]]; then
+ rm "${SOURCE_CACHE}/${SOURCE/.xz}"
+ fi &&
+ unxz -k "${SOURCE_CACHE}/${SOURCE}" &&

-# Fake new SOURCE for unpack_file and verify_file
-cd "${BUILD_DIRECTORY}" &&
-SOURCE=${SOURCE/.xz} &&
-verify_file '' &&
-unpack_file '' &&
+ # Fake new SOURCE for unpack_file and verify_file
+ cd "${BUILD_DIRECTORY}" &&
+ SOURCE=${SOURCE/.xz} &&
+ verify_file '' &&
+ unpack_file '' &&

-# Clean up
-message "${MESSAGE_COLOR}Removing temporary
${SOURCE_CACHE}/${SOURCE}...${DEFAULT_COLOR}" &&
-rm "${SOURCE_CACHE}/${SOURCE}" &&
+ # Clean up
+ message "${MESSAGE_COLOR}Removing temporary
${SOURCE_CACHE}/${SOURCE}...${DEFAULT_COLOR}" &&
+ rm "${SOURCE_CACHE}/${SOURCE}" &&

-cd "$SOURCE_DIRECTORY" &&
-
-if [[ "$BTRFS_PROGS_BRANCH" == scm ]]; then
+ cd "${SOURCE_DIRECTORY}"
+else
+ default_pre_build &&
+ cd "${SOURCE_DIRECTORY}" &&
./autogen.sh
fi



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (d2a55e31dd73d524c703b8dc8053d845788dc825), Pavel Vinogradov, 05/23/2017

Archive powered by MHonArc 2.6.24.

Top of Page