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

buildsystem: fix image creation

Browse Source
This commit is contained in:
Stefan Saraev 2013-12-29 21:19:14 +02:00
parent c2afe085ea
commit 87a83d1142
3 changed files with 62 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,7 @@ PKG_SITE="http://syslinux.zytor.com/"
PKG_URL="http://www.kernel.org/pub/linux/utils/boot/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2" PKG_URL="http://www.kernel.org/pub/linux/utils/boot/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS="" PKG_DEPENDS=""
PKG_BUILD_DEPENDS_HOST="toolchain util-linux:host" PKG_BUILD_DEPENDS_HOST="toolchain util-linux:host"
PKG_BUILD_DEPENDS_TARGET="toolchain util-linux e2fsprogs" PKG_BUILD_DEPENDS_TARGET="toolchain util-linux e2fsprogs syslinux:host"
PKG_PRIORITY="optional" PKG_PRIORITY="optional"
PKG_SECTION="tools" PKG_SECTION="tools"
PKG_SHORTDESC="syslinux: Linux bootloader collection" PKG_SHORTDESC="syslinux: Linux bootloader collection"

13
scripts/image
View File

@ -268,7 +268,18 @@ IMAGE_NAME="$DISTRONAME-$TARGET_VERSION"
# create image files if requested # create image files if requested
if [ "$1" = "mkimage" -a -n "$BOOTLOADER" ]; then if [ "$1" = "mkimage" -a -n "$BOOTLOADER" ]; then
. $SCRIPTS/mkimage # variables used in image script must be passed
sudo env \
PATH="$PATH" \
ROOT="$ROOT" \
TOOLCHAIN="$TOOLCHAIN" \
TARGET_IMG="$TARGET_IMG" \
IMAGE_NAME="$IMAGE_NAME" \
BOOTLOADER="$BOOTLOADER" \
RELEASE_DIR="$RELEASE_DIR" \
UUID_SYSTEM="$(uuidgen)" \
UUID_STORAGE="$(uuidgen)" \
$SCRIPTS/mkimage
fi fi
# cleanup release dir # cleanup release dir

100
scripts/mkimage
View File

@ -18,15 +18,12 @@
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>. # along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################ ################################################################################
. config/options $1 ################################################################################
# variables such as $ROOT $PATH etc... that are required for this
if [ "$BOOTLOADER" = "syslinux" ]; then # script to work must be passed via env ... in scripts/image
$SCRIPTS/build syslinux:host ################################################################################
fi
# set variables # set variables
UUID_SYSTEM=$(uuidgen)
UUID_STORAGE=$(uuidgen)
OE_TMP=$(mktemp -d) OE_TMP=$(mktemp -d)
LOOP=$(losetup -f) LOOP=$(losetup -f)
@ -43,18 +40,19 @@ fi
# functions # functions
cleanup() { cleanup() {
echo "image: cleanup..." echo "image: cleanup..."
sudo umount "$OE_TMP" &>/dev/null || : umount "$OE_TMP" &>/dev/null || :
sudo losetup -d "$LOOP" losetup -d "$LOOP"
[ -f "$OE_TMP/ldlinux.sys" ] && sudo chattr -i "$OE_TMP/ldlinux.sys" || : [ -f "$OE_TMP/ldlinux.sys" ] && chattr -i "$OE_TMP/ldlinux.sys" || :
sudo rm -rf "$OE_TMP" rm -rf "$OE_TMP"
exit
} }
trap cleanup SIGINT trap cleanup SIGINT
# ensure loopX not in use # ensure loopX not in use
sudo umount "$OE_TMP" &>/dev/null || : umount "$OE_TMP" &>/dev/null || :
sudo umount "$LOOP" &>/dev/null >/dev/null || : umount "$LOOP" &>/dev/null >/dev/null || :
sudo losetup -d "$LOOP" &>/dev/null >/dev/null || : losetup -d "$LOOP" &>/dev/null >/dev/null || :
# create an image # create an image
echo "image: creating image: $DISK..." echo "image: creating image: $DISK..."
@ -63,24 +61,24 @@ trap cleanup SIGINT
# write a disklabel # write a disklabel
echo "image: creating partition table on $DISK..." echo "image: creating partition table on $DISK..."
sudo losetup "$LOOP" "$DISK" losetup "$LOOP" "$DISK"
sudo parted -s "$LOOP" mklabel msdos parted -s "$LOOP" mklabel msdos
sync sync
# create part1 # create part1
echo "image: creating part1 on $DISK..." echo "image: creating part1 on $DISK..."
SYSTEM_PART_END=$(( $SYSTEM_SIZE * 1024 * 1024 / 512 + 64 )) SYSTEM_PART_END=$(( $SYSTEM_SIZE * 1024 * 1024 / 512 + 64 ))
if [ "$BOOTLOADER" = "syslinux" ]; then if [ "$BOOTLOADER" = "syslinux" ]; then
sudo parted -s "$LOOP" -a min unit s mkpart primary ext4 64 $SYSTEM_PART_END parted -s "$LOOP" -a min unit s mkpart primary ext4 64 $SYSTEM_PART_END
elif [ "$BOOTLOADER" = "bcm2835-bootloader" ]; then elif [ "$BOOTLOADER" = "bcm2835-bootloader" ]; then
sudo parted -s "$LOOP" -a min unit s mkpart primary fat32 64 $SYSTEM_PART_END parted -s "$LOOP" -a min unit s mkpart primary fat32 64 $SYSTEM_PART_END
fi fi
sudo parted -s "$LOOP" set 1 boot on parted -s "$LOOP" set 1 boot on
# create part2 # create part2
echo "image: creating part2 on $DISK..." echo "image: creating part2 on $DISK..."
STORAGE_PART_START=$(( $SYSTEM_PART_END + 1 )) STORAGE_PART_START=$(( $SYSTEM_PART_END + 1 ))
sudo parted -s "$LOOP" -a min unit s mkpart primary ext4 $STORAGE_PART_START 100% parted -s "$LOOP" -a min unit s mkpart primary ext4 $STORAGE_PART_START 100%
sync sync
if [ "$BOOTLOADER" = "syslinux" ]; then if [ "$BOOTLOADER" = "syslinux" ]; then
@ -88,34 +86,34 @@ if [ "$BOOTLOADER" = "syslinux" ]; then
echo "image: writing mbr..." echo "image: writing mbr..."
MBR="$ROOT/$TOOLCHAIN/share/syslinux/mbr.bin" MBR="$ROOT/$TOOLCHAIN/share/syslinux/mbr.bin"
if [ -n "$MBR" ]; then if [ -n "$MBR" ]; then
sudo dd bs=440 count=1 conv=notrunc if="$MBR" of="$LOOP" dd bs=440 count=1 conv=notrunc if="$MBR" of="$LOOP"
fi fi
sync sync
fi fi
# create filesystem on part1 # create filesystem on part1
sudo losetup -d "$LOOP" losetup -d "$LOOP"
echo "image: creating filesystem on part1..." echo "image: creating filesystem on part1..."
OFFSET=$(( 64 * 512 )) OFFSET=$(( 64 * 512 ))
SIZELIMIT=$(( $SYSTEM_SIZE * 1024 * 1024 )) SIZELIMIT=$(( $SYSTEM_SIZE * 1024 * 1024 ))
sudo losetup -o $OFFSET --sizelimit $SIZELIMIT "$LOOP" "$DISK" losetup -o $OFFSET --sizelimit $SIZELIMIT "$LOOP" "$DISK"
if [ "$BOOTLOADER" = "syslinux" ]; then if [ "$BOOTLOADER" = "syslinux" ]; then
sudo mke2fs -q -t ext4 -m 0 "$LOOP" mke2fs -q -t ext4 -m 0 "$LOOP"
sudo tune2fs -U $UUID_SYSTEM "$LOOP" tune2fs -U $UUID_SYSTEM "$LOOP"
sudo e2fsck -n "$LOOP" e2fsck -n "$LOOP"
elif [ "$BOOTLOADER" = "bcm2835-bootloader" ]; then elif [ "$BOOTLOADER" = "bcm2835-bootloader" ]; then
sudo mkfs.vfat "$LOOP" mkfs.vfat "$LOOP"
fi fi
sync sync
# mount partition # mount partition
echo "image: mounting part1 on $OE_TMP..." echo "image: mounting part1 on $OE_TMP..."
sudo mount "$LOOP" "$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..."
cat << EOF | sudo tee "$OE_TMP"/syslinux.cfg cat << EOF > "$OE_TMP"/syslinux.cfg
UI vesamenu.c32 UI vesamenu.c32
PROMPT 0 PROMPT 0
MENU TITLE Boot Menu MENU TITLE Boot Menu
@ -158,59 +156,59 @@ EOF
# install extlinux # install extlinux
echo "image: installing extlinux to part1..." echo "image: installing extlinux to part1..."
sudo $ROOT/$TOOLCHAIN/bin/extlinux --heads=4 --sector=32 -i "$OE_TMP" extlinux --heads=4 --sector=32 -i "$OE_TMP"
# copy files # copy files
echo "image: copying files to part1..." echo "image: copying files to part1..."
sudo cp $TARGET_IMG/$IMAGE_NAME.kernel "$OE_TMP/KERNEL" cp $TARGET_IMG/$IMAGE_NAME.kernel "$OE_TMP/KERNEL"
sudo cp $TARGET_IMG/$IMAGE_NAME.system "$OE_TMP/SYSTEM" cp $TARGET_IMG/$IMAGE_NAME.system "$OE_TMP/SYSTEM"
sudo cp $RELEASE_DIR/splash.png "$OE_TMP" cp $RELEASE_DIR/splash.png "$OE_TMP"
sudo cp $ROOT/$TOOLCHAIN/share/syslinux/vesamenu.c32 "$OE_TMP" cp $ROOT/$TOOLCHAIN/share/syslinux/vesamenu.c32 "$OE_TMP"
sudo cp $ROOT/$TOOLCHAIN/share/syslinux/libcom32.c32 "$OE_TMP" cp $ROOT/$TOOLCHAIN/share/syslinux/libcom32.c32 "$OE_TMP"
sudo cp $ROOT/$TOOLCHAIN/share/syslinux/libutil.c32 "$OE_TMP" cp $ROOT/$TOOLCHAIN/share/syslinux/libutil.c32 "$OE_TMP"
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..."
cat << EOF | sudo tee "$OE_TMP"/cmdline.txt cat << EOF > "$OE_TMP"/cmdline.txt
boot=/dev/mmcblk0p1 disk=/dev/mmcblk0p2 quiet boot=/dev/mmcblk0p1 disk=/dev/mmcblk0p2 quiet
EOF EOF
# copy files # copy files
echo "image: copying files to part1..." echo "image: copying files to part1..."
sudo cp $TARGET_IMG/$IMAGE_NAME.kernel "$OE_TMP/kernel.img" cp $TARGET_IMG/$IMAGE_NAME.kernel "$OE_TMP/kernel.img"
sudo cp $TARGET_IMG/$IMAGE_NAME.system "$OE_TMP/SYSTEM" cp $TARGET_IMG/$IMAGE_NAME.system "$OE_TMP/SYSTEM"
sudo cp $RELEASE_DIR/3rdparty/bootloader/bootcode.bin "$OE_TMP" cp $RELEASE_DIR/3rdparty/bootloader/bootcode.bin "$OE_TMP"
sudo cp $RELEASE_DIR/3rdparty/bootloader/fixup.dat "$OE_TMP" cp $RELEASE_DIR/3rdparty/bootloader/fixup.dat "$OE_TMP"
sudo cp $RELEASE_DIR/3rdparty/bootloader/start.elf "$OE_TMP" cp $RELEASE_DIR/3rdparty/bootloader/start.elf "$OE_TMP"
fi # bootloader fi # bootloader
# unmount part1 # unmount part1
echo "image: unmounting part1..." echo "image: unmounting part1..."
sync sync
sudo umount "$LOOP" umount "$LOOP"
# create filesystem on part2 # create filesystem on part2
sudo losetup -d "$LOOP" losetup -d "$LOOP"
echo "image: creating filesystem on part2..." echo "image: creating filesystem on part2..."
OFFSET=$(( $STORAGE_PART_START * 512 )) OFFSET=$(( $STORAGE_PART_START * 512 ))
sudo losetup -o $OFFSET "$LOOP" "$DISK" losetup -o $OFFSET "$LOOP" "$DISK"
sudo mke2fs -q -t ext4 -m 0 "$LOOP" mke2fs -q -t ext4 -m 0 "$LOOP"
sudo tune2fs -U $UUID_STORAGE "$LOOP" tune2fs -U $UUID_STORAGE "$LOOP"
sudo e2fsck -n "$LOOP" e2fsck -n "$LOOP"
sync sync
# mount part2 # mount part2
echo "image: mounting part2 on $OE_TMP..." echo "image: mounting part2 on $OE_TMP..."
sudo mount "$LOOP" "$OE_TMP" mount "$LOOP" "$OE_TMP"
# add resize mark # add resize mark
sudo touch "$OE_TMP/.please_resize_me" touch "$OE_TMP/.please_resize_me"
sync sync
# unmount part2 # unmount part2
echo "image: unmounting part2..." echo "image: unmounting part2..."
sudo umount "$LOOP" umount "$LOOP"
sync sync
# gzip # gzip