[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[patch] squashfs.sort not found when --build-with-chroot false



Hi,

when building with --build-with-chroot false, even if
config/binary_rootfs/squashfs.sort exists, mksquashfs can't find it:

	Could not open sort_list file...: No such file or directory

This problem does not happen when --build-with-chroot false is not
used.

Attached patch fixes the (obvious) bug.

Bye,
-- 
  intrigeri <intrigeri+debian-live@boum.org>
  | GnuPG key @ https://gaffer.ptitcanardnoir.org/intrigeri/intrigeri.asc
  | OTR fingerprint @ https://gaffer.ptitcanardnoir.org/intrigeri/otr-fingerprint.asc
  | We're dreaming of something else.
  | Something more clandestine, something happier.

>From e6c0aa1ac4d2028158068c4ad33d14a03bddeed2 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Thu, 30 Sep 2010 13:57:55 +0200
Subject: [PATCH] Fixing squashfs.sort location with --build-with-chroot false.

---
 scripts/build/lb_binary_rootfs |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs
index 27af099..341bb70 100755
--- a/scripts/build/lb_binary_rootfs
+++ b/scripts/build/lb_binary_rootfs
@@ -307,7 +307,14 @@ case "${LB_CHROOT_FILESYSTEM}" in
 		if [ -f config/binary_rootfs/squashfs.sort ]
 		then
 			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -sort squashfs.sort"
-			cp config/binary_rootfs/squashfs.sort chroot #FIXME
+			case "${LB_BUILD_WITH_CHROOT}" in
+				true)
+					cp config/binary_rootfs/squashfs.sort chroot
+					;;
+				false)
+					cp config/binary_rootfs/squashfs.sort .
+					;;
+			esac
 		fi
 
 		case "${LB_BUILD_WITH_CHROOT}" in
-- 
1.7.1


Reply to: