You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
diff --git a/bin/gbuild b/bin/gbuild
|
|
index 4e7839f..d1601d3 100755
|
|
--- a/bin/gbuild
|
|
+++ b/bin/gbuild
|
|
@@ -94,6 +94,8 @@ def build_one_configuration(suite, arch, build_desc, reference_datetime)
|
|
File.open("var/build-script", "w") do |script|
|
|
script.puts "#!/bin/bash"
|
|
script.puts "set -e"
|
|
+ script.puts "export LANG='en_US.UTF-8'"
|
|
+ script.puts "export LC_ALL='en_US.UTF-8'"
|
|
script.puts "export OUTDIR=$HOME/out"
|
|
script.puts "GBUILD_BITS=#{bits}"
|
|
script.puts "MAKEOPTS=(-j#{@options[:num_procs]})"
|
|
diff --git a/bin/make-base-vm b/bin/make-base-vm
|
|
index c1920f3..8a44f13 100755
|
|
--- a/bin/make-base-vm
|
|
+++ b/bin/make-base-vm
|
|
@@ -109,16 +109,3 @@ rm -rf $OUT
|
|
sudo vmbuilder kvm ubuntu --rootsize 10240 --arch=$ARCH --suite=$SUITE --addpkg=$addpkg --removepkg=$removepkg --ssh-key=var/id_dsa.pub --ssh-user-key=var
|
|
mv $OUT/*.qcow2 $OUT.qcow2
|
|
rm -rf $OUT
|
|
-
|
|
-if [ $LXC = "1" ]; then
|
|
- #sudo debootstrap --include=$addpkg --arch=$ARCH $SUITE $OUT-root $MIRROR
|
|
- echo Extracting partition for lxc
|
|
- qemu-img convert $OUT.qcow2 $OUT.raw
|
|
- loop=`sudo kpartx -av $OUT.raw|sed -n '/loop.p1/{s/.*loop\(.\)p1.*/\1/;p}'`
|
|
- sudo cp --sparse=always /dev/mapper/loop${loop}p1 $OUT
|
|
- sudo chown $USER $OUT
|
|
- sudo kpartx -d /dev/loop$loop
|
|
- rm -f $OUT.raw
|
|
- # bootstrap-fixup is done in libexec/make-clean-vm
|
|
-fi
|
|
-
|