Commit c6e362ce authored by Guido Gunther's avatar Guido Gunther

Move files we ship to data

so files/ only contains generated stuff.

This Separates files we want to upload (needed to build the image) from
files in this repo and temporary files like logs before things get out
of control.
parent 128a1aff
debootstrap.log
*.deb
*.img
*.img.xz
*.img.log
*.img.stamp
files/uboot-*/
files/*.changes
files/*.deb
files/*.debian.tar.gz
files/*.dsc
files/*-git.txt
files/*.imx
files/*.orig.tar.gz
files/
tmp/
build/kernel-git-arm.txt
build/u-boot-*/
build/u-boot-*.imx
......
......@@ -6,11 +6,11 @@ COMPRESSED=$(IMAGE).xz
all: sha256sums
$(IMAGE).stamp: lava.sh root.sh
tmp/$(IMAGE).stamp: lava.sh root.sh
./lava.sh -b $(BOARD)
touch $(IMAGE).stamp
touch tmp/$(IMAGE).stamp
%.img.xz: %.img %.img.stamp
%.img.xz: %.img tmp/%.img.stamp
xz -T0 --stdout $< > $@.tmp
mv $@.tmp $@
sha256sum imx6.img.xz
......@@ -20,7 +20,7 @@ sha256sums: $(COMPRESSED)
mv $@.tmp $@
clean:
rm -f files/*.deb *.img *.img.* sha256sums
rm -f files/ tmp/ *.img *.img.xz sha256sums
check:
bash -n lava.sh root.sh
......
......@@ -89,12 +89,14 @@ packages="
"
echo "Installing extra packages ${packages}"
mkdir -p tmp/ files/
kernel_deb=linux-image-${kernel_version}_${kernel_arch}.deb
[ -f "files/${kernel_deb}" ] || wget -Pfiles/ "${kernel_url}/${kernel_deb}"
sudo pureos_board=${pureos_board} distro=${distro} packages="${packages}" vmdebootstrap \
--enable-dhcp --no-kernel \
--verbose --image $bootimg --log $bootimg.log --size 3G \
--verbose --image $bootimg --log tmp/$bootimg.log --size 3G \
--bootoffset 1M \
--mirror "${mirror}" \
--arch=${arch} \
......@@ -115,7 +117,6 @@ sudo pureos_board=${pureos_board} distro=${distro} packages="${packages}" vmdebo
if [ ${pureos_board} != "imx6" ]; then
if [ ! -e files/${uboot} ]; then
mkdir -p files
wget "${kernel_url}/${uboot}" -O files/${uboot}
fi
sudo losetup -P /dev/loop0 ${bootimg}
......
......@@ -76,7 +76,7 @@ function setup_kernel()
function setup_uboot()
{
sed -e "s/##DTBNAME##/${fdt_file}/" files/boot-${pureos_board}.txt.in > $basedir/boot/boot.txt
sed -e "s/##DTBNAME##/${fdt_file}/" data/boot-${pureos_board}.txt.in > $basedir/boot/boot.txt
mkimage -A arm -T script -O linux -d $basedir/boot/boot.txt $basedir/boot/boot.scr
ln -fs boot.scr $basedir/boot/6x_bootscript
......@@ -117,7 +117,7 @@ function setup_gui()
# Allow purism user to launch weston from the console
chroot $basedir adduser purism weston-launch
# Will move into a debian package once we have build infra
cp files/weston.service $basedir/etc/systemd/system/
cp data/weston.service $basedir/etc/systemd/system/
chroot $basedir systemctl enable weston.service
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment