GitHub-Mirror/build
2
0
Fork 0
mirror of https://github.com/Fishwaldo/build.git synced 2025-06-25 15:48:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Set ext4 options in debootstrap-ng to match old debootstrap

Browse source 
Disable patch that doesn't apply on current sunxi-next kernel
This commit is contained in:
zador-blood-stained 2016-04-17 14:08:38 +03:00
parent 7a92cfe632
commit d78c9e2d01
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
debootstrap-ng.sh
View file

@ -318,7 +318,7 @@ prepare_partitions()
parttype[btrfs]=btrfs parttype[btrfs]=btrfs
# parttype[nfs] is empty # parttype[nfs] is empty
mkopts[ext4]='-q' # "-O journal_data_writeback" can be set here mkopts[ext4]='-q -m 2'
mkopts[fat]='-n BOOT' mkopts[fat]='-n BOOT'
# mkopts[f2fs] is empty # mkopts[f2fs] is empty
# mkopts[btrfs] is empty # mkopts[btrfs] is empty
@ -348,9 +348,9 @@ prepare_partitions()
fi fi
else else
local imagesize=$(( $rootfs_size + $OFFSET + $BOOTSIZE )) # MiB local imagesize=$(( $rootfs_size + $OFFSET + $BOOTSIZE )) # MiB
# Hardcoded overhead +30% for ext4 leaves ~10% free on root partition # Hardcoded overhead +20% and +128MB for ext4 leaves ~15% free on root partition
# extra 128 MiB for emergency swap file # extra 128 MiB for emergency swap file
local sdsize=$(bc -l <<< "scale=0; ($imagesize * 1.3) / 1 + 128") local sdsize=$(bc -l <<< "scale=0; ($imagesize * 1.2) / 1 + 128")
fi fi
# stage: create blank image # stage: create blank image
@ -358,7 +358,6 @@ prepare_partitions()
dd if=/dev/zero bs=1M status=none count=$sdsize | pv -p -b -r -s $(( $sdsize * 1024 * 1024 )) | dd status=none of=$CACHEDIR/tmprootfs.raw dd if=/dev/zero bs=1M status=none count=$sdsize | pv -p -b -r -s $(( $sdsize * 1024 * 1024 )) | dd status=none of=$CACHEDIR/tmprootfs.raw
# stage: determine partition configuration # stage: determine partition configuration
# boot
if [[ $ROOTFS_TYPE != ext4 && $BOOTSIZE == 0 ]]; then if [[ $ROOTFS_TYPE != ext4 && $BOOTSIZE == 0 ]]; then
local bootfs=ext4 local bootfs=ext4
BOOTSIZE=32 # MiB BOOTSIZE=32 # MiB
@ -398,9 +397,11 @@ prepare_partitions()
# stage: create fs # stage: create fs
if [[ $BOOTSIZE == 0 ]]; then if [[ $BOOTSIZE == 0 ]]; then
eval mkfs.${mkfs[$ROOTFS_TYPE]} ${mkopts[$ROOTFS_TYPE]} ${LOOP}p1 ${OUTPUT_VERYSILENT:+' >/dev/null 2>/dev/null'} eval mkfs.${mkfs[$ROOTFS_TYPE]} ${mkopts[$ROOTFS_TYPE]} ${LOOP}p1 ${OUTPUT_VERYSILENT:+' >/dev/null 2>/dev/null'}
[[ $ROOTFS_TYPE == ext4 ]] && tune2fs -o journal_data_writeback ${LOOP}p1 > /dev/null
else else
if [[ $ROOTFS_TYPE != nfs ]]; then if [[ $ROOTFS_TYPE != nfs ]]; then
eval mkfs.${mkfs[$ROOTFS_TYPE]} ${mkopts[$ROOTFS_TYPE]} ${LOOP}p2 ${OUTPUT_VERYSILENT:+' >/dev/null 2>/dev/null'} eval mkfs.${mkfs[$ROOTFS_TYPE]} ${mkopts[$ROOTFS_TYPE]} ${LOOP}p2 ${OUTPUT_VERYSILENT:+' >/dev/null 2>/dev/null'}
[[ $ROOTFS_TYPE == ext4 ]] && tune2fs -o journal_data_writeback ${LOOP}p2 > /dev/null
fi fi
eval mkfs.${mkfs[$bootfs]} ${mkopts[$bootfs]} ${LOOP}p1 ${OUTPUT_VERYSILENT:+' >/dev/null 2>/dev/null'} eval mkfs.${mkfs[$bootfs]} ${mkopts[$bootfs]} ${LOOP}p1 ${OUTPUT_VERYSILENT:+' >/dev/null 2>/dev/null'}
fi fi
@ -470,15 +471,13 @@ create_image()
if [[ $(findmnt --target $CACHEDIR/mount/boot -o FSTYPE -n) == vfat ]]; then if [[ $(findmnt --target $CACHEDIR/mount/boot -o FSTYPE -n) == vfat ]]; then
# fat32 # fat32
rsync -rLtWh --info=progress2,stats1 $CACHEDIR/sdcard/boot $CACHEDIR/mount rsync -rLtWh --info=progress2,stats1 $CACHEDIR/sdcard/boot $CACHEDIR/mount
else else
# ext4 # ext4
rsync -aHWh --info=progress2,stats1 $CACHEDIR/sdcard/boot $CACHEDIR/mount rsync -aHWh --info=progress2,stats1 $CACHEDIR/sdcard/boot $CACHEDIR/mount
fi fi
# DEBUG: print free space # DEBUG: print free space
display_alert "Free space:" "SD card" "info" display_alert "Free space:" "SD card" "info"
df -h | grep "$CACHEDIR/" | tee -a $DEST/debug/debootstrap.log df -h | grep "$CACHEDIR/" | tee -a $DEST/debug/debootstrap.log
# stage: write u-boot # stage: write u-boot
@ -518,7 +517,7 @@ create_image()
fi fi
rm -f $VERSION.raw *.asc armbian.txt rm -f $VERSION.raw *.asc armbian.txt
FILESIZE=$(ls -l --b=M $FILENAME | cut -d " " -f5) FILESIZE=$(ls -l --b=M $FILENAME | cut -d " " -f5)
display_alert "Done building" "$FILENAME [$FILESIZE]" "info" display_alert "Done building" "$FILENAME [$FILESIZE]" "info"
fi fi
} ############################################################################# } #############################################################################

0
patch/kernel/sunxi-next/brcmfmac_ap_banana_ct.patch → patch/kernel/sunxi-next/brcmfmac_ap_banana_ct.patch.disabled
View file