jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

scripts/mkimage: create disk image without sudo

Browse Source 
Mtools is used to format and copy files to vfat partition.
Populatefs is used to copy files to ext4 partition.

Tested on imx6 with u-boot, Generic with BIOS and EFI boot.

To avoid messing around with ext4 partition we could also provide "empty" disk image file. Both partitions would be already formatted and storage partition would already contain resize file. Then mkimage script would only copy kernel, system, bootloader files and install bootloader.
But current approach is more flexible for future use.
This commit is contained in:
Peter Vicman 2016-02-09 10:40:13 +01:00
parent 5d25757702
commit 3b75736931
7 changed files with 230 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/sysutils/e2fsprogs/package.mk
View File

@ -37,6 +37,10 @@ if [ "$HFSTOOLS" = "yes" ]; then
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET diskdev_cmds" PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET diskdev_cmds"
fi fi
PKG_CONFIGURE_OPTS_HOST="--prefix=/usr \
--bindir=/bin \
--sbindir=/sbin"
PKG_CONFIGURE_OPTS_TARGET="BUILD_CC=$HOST_CC \ PKG_CONFIGURE_OPTS_TARGET="BUILD_CC=$HOST_CC \
--prefix=/usr \ --prefix=/usr \
--bindir=/bin \ --bindir=/bin \
@ -96,3 +100,19 @@ makeinstall_init() {
ln -sf mke2fs $INSTALL/sbin/mkfs.ext4dev ln -sf mke2fs $INSTALL/sbin/mkfs.ext4dev
fi fi
} }
make_host() {
make -C lib/et
make -C lib/ext2fs
}
makeinstall_host() {
make -C lib/et DESTDIR=$(pwd)/.install install
make -C lib/ext2fs DESTDIR=$(pwd)/.install install
rm -fr $(pwd)/.install/bin
rm -fr $(pwd)/.install/usr/share
cp -Pa $(pwd)/.install/usr/* $ROOT/$TOOLCHAIN
}

40
packages/tools/mtools/package.mk Normal file
View File

@ -0,0 +1,40 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
#
# OpenELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# OpenELEC is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################
PKG_NAME="mtools"
PKG_VERSION="4.0.18"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.gnu.org/software/mtools/"
PKG_URL="ftp://ftp.gnu.org/gnu/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS_HOST=""
PKG_PRIORITY="optional"
PKG_SECTION="tools"
PKG_SHORTDESC="mtools: A collection of utilities to access MS-DOS disks"
PKG_LONGDESC="mtools: A collection of utilities to access MS-DOS disks"
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
PKG_AUTORECONF="yes"
makeinstall_host() {
$STRIP mtools
mkdir -p $ROOT/$TOOLCHAIN/sbin
cp -P mtools mformat mcopy mmd $ROOT/$TOOLCHAIN/sbin
}

43
packages/tools/populatefs/package.mk Normal file
View File

@ -0,0 +1,43 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
#
# OpenELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# OpenELEC is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################
PKG_NAME="populatefs"
PKG_VERSION="95cc98b"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/oskarirauta/populatefs"
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS_HOST="e2fsprogs:host"
PKG_PRIORITY="optional"
PKG_SECTION="tools"
PKG_SHORTDESC="populatefs: Tool for replacing genext2fs when creating ext4 images"
PKG_LONGDESC="populatefs: Tool for replacing genext2fs when creating ext4 images"
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
make_host() {
make EXTRA_LIBS="-lcom_err -lpthread" CFLAGS="$CFLAGS -fPIC"
}
makeinstall_host() {
$STRIP src/populatefs
mkdir -p $ROOT/$TOOLCHAIN/sbin
cp src/populatefs $ROOT/$TOOLCHAIN/sbin
}

1
packages/tools/syslinux/package.mk
View File

@ -72,6 +72,7 @@ makeinstall_host() {
mkdir -p $ROOT/$TOOLCHAIN/bin mkdir -p $ROOT/$TOOLCHAIN/bin
cp bios/extlinux/extlinux $ROOT/$TOOLCHAIN/bin cp bios/extlinux/extlinux $ROOT/$TOOLCHAIN/bin
cp bios/linux/syslinux $ROOT/$TOOLCHAIN/bin cp bios/linux/syslinux $ROOT/$TOOLCHAIN/bin
cp bios/mtools/syslinux $ROOT/$TOOLCHAIN/bin/syslinux.mtools
mkdir -p $ROOT/$TOOLCHAIN/share/syslinux mkdir -p $ROOT/$TOOLCHAIN/share/syslinux
cp bios/mbr/mbr.bin $ROOT/$TOOLCHAIN/share/syslinux cp bios/mbr/mbr.bin $ROOT/$TOOLCHAIN/share/syslinux

6
scripts/image
View File

@ -28,6 +28,8 @@ $SCRIPTS/build squashfs:host
$SCRIPTS/build dosfstools:host $SCRIPTS/build dosfstools:host
$SCRIPTS/build fakeroot:host $SCRIPTS/build fakeroot:host
$SCRIPTS/build kmod:host $SCRIPTS/build kmod:host
$SCRIPTS/build mtools:host
$SCRIPTS/build populatefs:host
BUILD_DATE=`date +%Y%m%d%H%M%S` BUILD_DATE=`date +%Y%m%d%H%M%S`
@ -319,10 +321,8 @@ fi
fi fi
fi fi
echo "mkimage: boo. now root access (sudo) is required..."
echo "mkimage: see scripts/image and scripts/mkimage if you dont trust us :)"
# variables used in image script must be passed # variables used in image script must be passed
sudo env \ env \
PATH="$PATH:/sbin" \ PATH="$PATH:/sbin" \
ROOT="$ROOT" \ ROOT="$ROOT" \
TOOLCHAIN="$TOOLCHAIN" \ TOOLCHAIN="$TOOLCHAIN" \

163
scripts/mkimage
View File

@ -25,7 +25,7 @@
# set variables # set variables
OE_TMP=$(mktemp -d) OE_TMP=$(mktemp -d)
LOOP=$(losetup -f) SAVE_ERROR="$OE_TMP/save_error"
SYSTEM_SIZE=512 SYSTEM_SIZE=512
STORAGE_SIZE=32 # STORAGE_SIZE must be >= 32 ! STORAGE_SIZE=32 # STORAGE_SIZE must be >= 32 !
@ -36,10 +36,17 @@
# functions # functions
cleanup() { cleanup() {
echo "image: cleanup..." echo "image: cleanup..."
umount "$OE_TMP" &>/dev/null || :
losetup -d "$LOOP"
[ -f "$OE_TMP/ldlinux.sys" ] && chattr -i "$OE_TMP/ldlinux.sys" || :
rm -rf "$OE_TMP" rm -rf "$OE_TMP"
echo
exit
}
show_error() {
echo "image: error happen..."
echo
cat "$SAVE_ERROR"
echo
cleanup
exit exit
} }
@ -51,40 +58,35 @@ trap cleanup SIGINT
FAT_VOL_ID="${UUID_1}${UUID_2}" FAT_VOL_ID="${UUID_1}${UUID_2}"
UUID_SYSTEM="${UUID_1}-${UUID_2}" UUID_SYSTEM="${UUID_1}-${UUID_2}"
# ensure loopX not in use
umount "$OE_TMP" &>/dev/null || :
umount "$LOOP" &>/dev/null >/dev/null || :
losetup -d "$LOOP" &>/dev/null >/dev/null || :
# create an image # create an image
echo "image: creating image: $DISK..." echo
dd if=/dev/zero of="$DISK" bs=1M count="$DISK_SIZE" echo "image: creating file $(basename $DISK)..."
sync dd if=/dev/zero of="$DISK" bs=1M count="$DISK_SIZE" conv=fsync >"$SAVE_ERROR" 2>&1 || show_error
# write a disklabel # write a disklabel
echo "image: creating partition table on $DISK..." echo "image: creating partition table..."
losetup "$LOOP" "$DISK"
if [ "$BOOTLOADER" = "syslinux" ]; then if [ "$BOOTLOADER" = "syslinux" ]; then
parted -s "$LOOP" mklabel gpt parted -s "$DISK" mklabel gpt
else else
parted -s "$LOOP" mklabel msdos parted -s "$DISK" mklabel msdos
fi fi
sync sync
# create part1 # create part1
echo "image: creating part1 on $DISK..." echo "image: creating part1..."
SYSTEM_PART_END=$(( $SYSTEM_SIZE * 1024 * 1024 / 512 + 2048 )) SYSTEM_PART_END=$(( $SYSTEM_SIZE * 1024 * 1024 / 512 + 2048 ))
parted -s "$LOOP" -a min unit s mkpart primary fat32 2048 $SYSTEM_PART_END parted -s "$DISK" -a min unit s mkpart primary fat32 2048 $SYSTEM_PART_END
if [ "$BOOTLOADER" = "syslinux" ]; then if [ "$BOOTLOADER" = "syslinux" ]; then
parted -s "$LOOP" set 1 legacy_boot on parted -s "$DISK" set 1 legacy_boot on
else else
parted -s "$LOOP" set 1 boot on parted -s "$DISK" set 1 boot on
fi fi
sync
# create part2 # create part2
echo "image: creating part2 on $DISK..." echo "image: creating part2..."
STORAGE_PART_START=$(( $SYSTEM_PART_END + 2048 )) STORAGE_PART_START=$(( $SYSTEM_PART_END + 2048 ))
STORAGE_PART_END=$(( $STORAGE_PART_START + (( $STORAGE_SIZE * 1024 * 1024 / 512 )) )) STORAGE_PART_END=$(( $STORAGE_PART_START + (( $STORAGE_SIZE * 1024 * 1024 / 512 )) ))
parted -s "$LOOP" -a min unit s mkpart primary ext4 $STORAGE_PART_START $STORAGE_PART_END parted -s "$DISK" -a min unit s mkpart primary ext4 $STORAGE_PART_START $STORAGE_PART_END
sync sync
if [ "$BOOTLOADER" = "syslinux" ]; then if [ "$BOOTLOADER" = "syslinux" ]; then
@ -92,29 +94,29 @@ if [ "$BOOTLOADER" = "syslinux" ]; then
echo "image: writing mbr..." echo "image: writing mbr..."
MBR="$ROOT/$TOOLCHAIN/share/syslinux/gptmbr.bin" MBR="$ROOT/$TOOLCHAIN/share/syslinux/gptmbr.bin"
if [ -n "$MBR" ]; then if [ -n "$MBR" ]; then
dd bs=440 count=1 conv=notrunc if="$MBR" of="$LOOP" dd bs=440 count=1 conv=fsync,notrunc if="$MBR" of="$DISK" >"$SAVE_ERROR" 2>&1 || show_error
fi fi
sync
fi fi
# create filesystem on part1 # create filesystem on part1
losetup -d "$LOOP"
sync
echo "image: creating filesystem on part1..." echo "image: creating filesystem on part1..."
OFFSET=$(( 2048 * 512 )) OFFSET=$(( 2048 * 512 ))
SIZELIMIT=$(( $SYSTEM_SIZE * 1024 * 1024 )) HEADS=4
losetup -o $OFFSET --sizelimit $SIZELIMIT "$LOOP" "$DISK" TRACKS=32
SECTORS=$(( $SYSTEM_SIZE * 1024 * 1024 / 512 / $HEADS / $TRACKS ))
shopt -s expand_aliases # enables alias expansion in script
alias mformat="mformat -i $DISK@@$OFFSET -h $HEADS -t $TRACKS -s $SECTORS"
alias mcopy="mcopy -i $DISK@@$OFFSET"
alias mmd="mmd -i $DISK@@$OFFSET"
if [ "$BOOTLOADER" = "syslinux" ]; then if [ "$BOOTLOADER" = "syslinux" ]; then
mkfs.vfat -i "$FAT_VOL_ID" "$LOOP" mformat -v "$FAT_VOL_ID" -N "$FAT_VOL_ID" ::
elif [ "$BOOTLOADER" = "bcm2835-bootloader" -o "$BOOTLOADER" = "u-boot" ]; then elif [ "$BOOTLOADER" = "bcm2835-bootloader" -o "$BOOTLOADER" = "u-boot" ]; then
mkfs.vfat "$LOOP" mformat ::
fi fi
sync sync
# mount partition
echo "image: mounting part1 on $OE_TMP..."
mount "$LOOP" "$OE_TMP"
if [ "$BOOTLOADER" = "syslinux" ]; then if [ "$BOOTLOADER" = "syslinux" ]; then
# create bootloader configuration # create bootloader configuration
echo "image: creating bootloader configuration..." echo "image: creating bootloader configuration..."
@ -133,18 +135,20 @@ LABEL live
APPEND boot=UUID=$UUID_SYSTEM live quiet tty vga=current APPEND boot=UUID=$UUID_SYSTEM live quiet tty vga=current
EOF EOF
mcopy "$OE_TMP/syslinux.cfg" ::
# install extlinux # install extlinux
echo "image: installing extlinux to part1..." echo "image: installing extlinux to part1..."
syslinux --heads=4 --sector=32 -i "$LOOP" syslinux.mtools --offset "$OFFSET" -i "$DISK"
# copy files # copy files
echo "image: copying files to part1..." echo "image: copying files to part1..."
cp $TARGET_IMG/$IMAGE_NAME.kernel "$OE_TMP/$KERNEL_NAME" mcopy $TARGET_IMG/$IMAGE_NAME.kernel "::/$KERNEL_NAME"
cp $TARGET_IMG/$IMAGE_NAME.system "$OE_TMP/SYSTEM" mcopy $TARGET_IMG/$IMAGE_NAME.system ::/SYSTEM
mkdir -p "$OE_TMP/EFI/BOOT" mmd EFI EFI/BOOT
cp $ROOT/$TOOLCHAIN/share/syslinux/bootx64.efi "$OE_TMP/EFI/BOOT" mcopy $ROOT/$TOOLCHAIN/share/syslinux/bootx64.efi ::/EFI/BOOT
cp $ROOT/$TOOLCHAIN/share/syslinux/ldlinux.e64 "$OE_TMP/EFI/BOOT" mcopy $ROOT/$TOOLCHAIN/share/syslinux/ldlinux.e64 ::/EFI/BOOT
cp "$OE_TMP"/syslinux.cfg "$OE_TMP"/EFI/BOOT/syslinux.cfg mcopy "$OE_TMP"/syslinux.cfg ::/EFI/BOOT
elif [ "$BOOTLOADER" = "bcm2835-bootloader" ]; then elif [ "$BOOTLOADER" = "bcm2835-bootloader" ]; then
# create bootloader configuration # create bootloader configuration
echo "image: creating bootloader configuration..." echo "image: creating bootloader configuration..."
@ -152,95 +156,92 @@ elif [ "$BOOTLOADER" = "bcm2835-bootloader" ]; then
boot=/dev/mmcblk0p1 disk=/dev/mmcblk0p2 quiet $EXTRA_CMDLINE boot=/dev/mmcblk0p1 disk=/dev/mmcblk0p2 quiet $EXTRA_CMDLINE
EOF EOF
mcopy "$OE_TMP/cmdline.txt" ::
# copy files # copy files
echo "image: copying files to part1..." echo "image: copying files to part1..."
cp $TARGET_IMG/$IMAGE_NAME.kernel "$OE_TMP/$KERNEL_NAME" mcopy $TARGET_IMG/$IMAGE_NAME.kernel "::/$KERNEL_NAME"
cp $TARGET_IMG/$IMAGE_NAME.system "$OE_TMP/SYSTEM" mcopy $TARGET_IMG/$IMAGE_NAME.system ::/SYSTEM
cp $RELEASE_DIR/3rdparty/bootloader/bootcode.bin "$OE_TMP" mcopy $RELEASE_DIR/3rdparty/bootloader/bootcode.bin ::
cp $RELEASE_DIR/3rdparty/bootloader/fixup.dat "$OE_TMP" mcopy $RELEASE_DIR/3rdparty/bootloader/fixup.dat ::
cp $RELEASE_DIR/3rdparty/bootloader/start.elf "$OE_TMP" mcopy $RELEASE_DIR/3rdparty/bootloader/start.elf ::
cp $RELEASE_DIR/3rdparty/bootloader/config.txt "$OE_TMP" mcopy $RELEASE_DIR/3rdparty/bootloader/config.txt ::
for dtb in $RELEASE_DIR/3rdparty/bootloader/*.dtb ; do for dtb in $RELEASE_DIR/3rdparty/bootloader/*.dtb ; do
if [ -f $dtb ] ; then if [ -f $dtb ] ; then
cp "$dtb" "$OE_TMP" mcopy "$dtb" ::/$(basename "$dtb")
fi fi
done done
if [ -d $RELEASE_DIR/3rdparty/bootloader/overlays ]; then if [ -d $RELEASE_DIR/3rdparty/bootloader/overlays ]; then
cp -r $RELEASE_DIR/3rdparty/bootloader/overlays "$OE_TMP" mcopy -s $RELEASE_DIR/3rdparty/bootloader/overlays ::
fi fi
elif [ "$BOOTLOADER" = "u-boot" ]; then elif [ "$BOOTLOADER" = "u-boot" ]; then
# create bootloader configuration # create bootloader configuration
echo "image: creating bootloader configuration..." echo "image: creating bootloader configuration..."
if [ -n "$UBOOT_SYSTEM" -a -f "$RELEASE_DIR/3rdparty/bootloader/uEnv-$UBOOT_SYSTEM.txt" ]; then if [ -n "$UBOOT_SYSTEM" -a -f "$RELEASE_DIR/3rdparty/bootloader/uEnv-$UBOOT_SYSTEM.txt" ]; then
cp "$RELEASE_DIR/3rdparty/bootloader/uEnv-$UBOOT_SYSTEM.txt" "$OE_TMP/uEnv.txt" mcopy "$RELEASE_DIR/3rdparty/bootloader/uEnv-$UBOOT_SYSTEM.txt" ::/uEnv.txt
elif [ -f "$RELEASE_DIR/3rdparty/bootloader/uEnv.txt" ]; then elif [ -f "$RELEASE_DIR/3rdparty/bootloader/uEnv.txt" ]; then
cp $RELEASE_DIR/3rdparty/bootloader/uEnv.txt "$OE_TMP" mcopy $RELEASE_DIR/3rdparty/bootloader/uEnv.txt ::
elif [ -f "$RELEASE_DIR/3rdparty/bootloader/boot.scr" ]; then elif [ -f "$RELEASE_DIR/3rdparty/bootloader/boot.scr" ]; then
cp $RELEASE_DIR/3rdparty/bootloader/boot.scr "$OE_TMP" mcopy $RELEASE_DIR/3rdparty/bootloader/boot.scr ::
fi fi
echo "image: installing u-boot bootloader..." echo "image: installing u-boot bootloader..."
if [ -n "$UBOOT_SYSTEM" -a -f "$RELEASE_DIR/3rdparty/bootloader/SPL-$UBOOT_SYSTEM" ]; then if [ -n "$UBOOT_SYSTEM" -a -f "$RELEASE_DIR/3rdparty/bootloader/SPL-$UBOOT_SYSTEM" ]; then
dd if="$RELEASE_DIR/3rdparty/bootloader/SPL-$UBOOT_SYSTEM" of="$DISK" bs=512 seek=2 conv=notrunc dd if="$RELEASE_DIR/3rdparty/bootloader/SPL-$UBOOT_SYSTEM" of="$DISK" bs=512 seek=2 conv=fsync,notrunc >"$SAVE_ERROR" 2>&1 || show_error
elif [ -f "$RELEASE_DIR/3rdparty/bootloader/SPL" ]; then elif [ -f "$RELEASE_DIR/3rdparty/bootloader/SPL" ]; then
dd if="$RELEASE_DIR/3rdparty/bootloader/SPL" of="$DISK" bs=512 seek=2 conv=notrunc dd if="$RELEASE_DIR/3rdparty/bootloader/SPL" of="$DISK" bs=512 seek=2 conv=fsync,notrunc >"$SAVE_ERROR" 2>&1 || show_error
elif [ -n "$UBOOT_SYSTEM" -a -f "$RELEASE_DIR/3rdparty/bootloader/u-boot-$UBOOT_SYSTEM.imx" ]; then elif [ -n "$UBOOT_SYSTEM" -a -f "$RELEASE_DIR/3rdparty/bootloader/u-boot-$UBOOT_SYSTEM.imx" ]; then
dd if="$RELEASE_DIR/3rdparty/bootloader/u-boot-$UBOOT_SYSTEM.imx" of="$DISK" bs=512 seek=2 conv=notrunc dd if="$RELEASE_DIR/3rdparty/bootloader/u-boot-$UBOOT_SYSTEM.imx" of="$DISK" bs=512 seek=2 conv=fsync,notrunc >"$SAVE_ERROR" 2>&1 || show_error
elif [ -f "$RELEASE_DIR/3rdparty/bootloader/u-boot.imx" ]; then elif [ -f "$RELEASE_DIR/3rdparty/bootloader/u-boot.imx" ]; then
dd if="$RELEASE_DIR/3rdparty/bootloader/u-boot.imx" of="$DISK" bs=512 seek=2 conv=notrunc dd if="$RELEASE_DIR/3rdparty/bootloader/u-boot.imx" of="$DISK" bs=512 seek=2 conv=fsync,notrunc >"$SAVE_ERROR" 2>&1 || show_error
fi fi
echo "image: copying files to part1..." echo "image: copying files to part1..."
cp $TARGET_IMG/$IMAGE_NAME.kernel "$OE_TMP/$KERNEL_NAME" mcopy $TARGET_IMG/$IMAGE_NAME.kernel "::/$KERNEL_NAME"
cp $TARGET_IMG/$IMAGE_NAME.system "$OE_TMP/SYSTEM" mcopy $TARGET_IMG/$IMAGE_NAME.system ::/SYSTEM
if [ -n "$UBOOT_SYSTEM" -a -f "$RELEASE_DIR/3rdparty/bootloader/u-boot-$UBOOT_SYSTEM.img" ]; then if [ -n "$UBOOT_SYSTEM" -a -f "$RELEASE_DIR/3rdparty/bootloader/u-boot-$UBOOT_SYSTEM.img" ]; then
cp "$RELEASE_DIR/3rdparty/bootloader/u-boot-$UBOOT_SYSTEM.img" "$OE_TMP/u-boot.img" mcopy "$RELEASE_DIR/3rdparty/bootloader/u-boot-$UBOOT_SYSTEM.img" ::/u-boot.img
elif [ -f $RELEASE_DIR/3rdparty/bootloader/u-boot.img ]; then elif [ -f $RELEASE_DIR/3rdparty/bootloader/u-boot.img ]; then
cp $RELEASE_DIR/3rdparty/bootloader/u-boot.img "$OE_TMP" mcopy $RELEASE_DIR/3rdparty/bootloader/u-boot.img ::
fi fi
for dtb in $RELEASE_DIR/3rdparty/bootloader/*.dtb ; do for dtb in $RELEASE_DIR/3rdparty/bootloader/*.dtb ; do
if [ -f $dtb ] ; then if [ -f $dtb ] ; then
cp "$dtb" "$OE_TMP" mcopy "$dtb" ::/$(basename "$dtb")
fi fi
done done
fi # bootloader fi # bootloader
# unmount part1 # extract part2 from image to format and copy files
echo "image: unmounting part1..." echo "image: extracting part2 from image..."
STORAGE_PART_COUNT=$(( $STORAGE_PART_END - $STORAGE_PART_START + 1 ))
sync sync
umount "$LOOP" dd if="$DISK" of="$OE_TMP/part2.ext4" bs=512 skip="$STORAGE_PART_START" count="$STORAGE_PART_COUNT" conv=fsync >"$SAVE_ERROR" 2>&1 || show_error
# create filesystem on part2 # create filesystem on part2
losetup -d "$LOOP"
sync
echo "image: creating filesystem on part2..." echo "image: creating filesystem on part2..."
OFFSET=$(( $STORAGE_PART_START * 512 )) mke2fs -F -q -t ext4 -m 0 "$OE_TMP/part2.ext4"
SIZELIMIT=$(( $STORAGE_SIZE * 1024 * 1024 )) tune2fs -U $UUID_STORAGE "$OE_TMP/part2.ext4" >"$SAVE_ERROR" 2>&1 || show_error
losetup -o $OFFSET --sizelimit $SIZELIMIT "$LOOP" "$DISK" e2fsck -n "$OE_TMP/part2.ext4" >"$SAVE_ERROR" 2>&1 || show_error
mke2fs -q -t ext4 -m 0 "$LOOP"
tune2fs -U $UUID_STORAGE "$LOOP"
e2fsck -n "$LOOP"
sync sync
# mount part2
echo "image: mounting part2 on $OE_TMP..."
mount "$LOOP" "$OE_TMP"
# add resize mark # add resize mark
if [ "$BOOTLOADER" != "syslinux" ]; then if [ "$BOOTLOADER" != "syslinux" ]; then
touch "$OE_TMP/.please_resize_me" mkdir "$OE_TMP/part2.fs"
touch "$OE_TMP/part2.fs/.please_resize_me"
echo "image: populating filesystem on part2..."
populatefs -U -d "$OE_TMP/part2.fs" "$OE_TMP/part2.ext4" >"$SAVE_ERROR" 2>&1 || show_error
sync sync
e2fsck -n "$OE_TMP/part2.ext4" >"$SAVE_ERROR" 2>&1 || show_error
fi fi
# unmount part2 # merge part2 back to disk image
echo "image: unmounting part2..." echo "image: merging part2 back to image..."
umount "$LOOP" dd if="$OE_TMP/part2.ext4" of="$DISK" bs=512 seek="$STORAGE_PART_START" conv=fsync,notrunc >"$SAVE_ERROR" 2>&1 || show_error
sync
# gzip # gzip
echo "image: compressing..." echo "image: compressing..."

41
tools/mkpkg/mkpkg_populatefs Normal file
View File

@ -0,0 +1,41 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
#
# OpenELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# OpenELEC is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################
echo "getting sources..."
if [ ! -d populatefs.git ]; then
git clone https://github.com/oskarirauta/populatefs.git populatefs.git
fi
cd populatefs.git
git pull
GIT_REV=$(git log -n1 --format=%h)
cd ..
echo "copying sources..."
rm -rf populatefs-$GIT_REV
cp -R populatefs.git populatefs-$GIT_REV
echo "cleaning sources..."
rm -rf populatefs-$GIT_REV/.git
echo "packing sources..."
tar cvJf populatefs-$GIT_REV.tar.xz populatefs-$GIT_REV
echo "remove temporary sourcedir..."
rm -rf populatefs-$GIT_REV