Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

base-files: move script into postinst function 

https://jira.digi.com/browse/DEL-5518

Signed-off-by: Jose Diaz de Grenu <Jose.DiazdeGrenu@digi.com>
This commit is contained in:
Jose Diaz de Grenu 2018-01-03 12:13:14 +01:00
parent 8aeb160912
commit 7852b69a3c
2 changed files with 25 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
meta-digi-dey/recipes-core/base-files/base-files/resize-ext4fs.sh
View File

@ -1,40 +0,0 @@
#!/bin/sh
#===============================================================================
#
# resize-ext4fs.sh
#
# Copyright (C) 2014 by Digi International Inc.
# All rights reserved.
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 as published by
# the Free Software Foundation.
#
#
# !Description: Resize EXT4 filesystems to the size of the partition
#
#===============================================================================
get_emmc_block_device() {
emmc_number="$(sed -ne 's,.*mmcblk\(.\)boot0.*,\1,g;T;p' /proc/partitions)"
if [ -b "/dev/mmcblk${emmc_number}" ] &&
[ -b "/dev/mmcblk${emmc_number}boot0" ] &&
[ -b "/dev/mmcblk${emmc_number}boot1" ] &&
[ -b "/dev/mmcblk${emmc_number}rpmb" ]; then
echo "/dev/mmcblk${emmc_number}"
fi
}
RESIZE2FS="$(which resize2fs)"
DM_BLOCK_DEVICE="/dev/dm-"
EMMC_BLOCK_DEVICE="$(get_emmc_block_device)"
if [ -x "${RESIZE2FS}" -a -n "${EMMC_BLOCK_DEVICE}" ]; then
PARTITIONS="$(blkid | sed -ne "{s,\(^${EMMC_BLOCK_DEVICE}[^:]\+\):.*TYPE=\"ext4\".*,\1,g;T;p}" | sort -u)"
# Add possible device mapper devices
PARTITIONS="${PARTITIONS} $(blkid | sed -ne "{s,\(^${DM_BLOCK_DEVICE}[^:]\+\):.*TYPE=\"ext4\".*,\1,g;T;p}" | sort -u)"
for i in ${PARTITIONS}; do
if ! ${RESIZE2FS} ${i} 2>/dev/null; then
echo "ERROR: resize2fs ${i}"
fi
done
fi

31
meta-digi-dey/recipes-core/base-files/base-files_3.0.14.bbappend
View File

@ -1,4 +1,4 @@
# Copyright (C) 2013 Digi International. # Copyright (C) 2013-2018 Digi International.
FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
@ -6,15 +6,34 @@ SRC_URI += " \
file://sysctl.conf \ file://sysctl.conf \
" "
SRC_URI_append_ccimx6 = " file://resize-ext4fs.sh"
do_install_append() { do_install_append() {
install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/ install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/
} }
do_install_append_ccimx6() { pkg_postinst_${PN}_ccimx6() {
install -d ${D}${sysconfdir}/${IMAGE_PKGTYPE}-postinsts get_emmc_block_device() {
install -m 0755 ${WORKDIR}/resize-ext4fs.sh ${D}${sysconfdir}/${IMAGE_PKGTYPE}-postinsts/ emmc_number="$(sed -ne 's,.*mmcblk\(.\)boot0.*,\1,g;T;p' /proc/partitions)"
if [ -b "/dev/mmcblk${emmc_number}" ] &&
[ -b "/dev/mmcblk${emmc_number}boot0" ] &&
[ -b "/dev/mmcblk${emmc_number}boot1" ] &&
[ -b "/dev/mmcblk${emmc_number}rpmb" ]; then
echo "/dev/mmcblk${emmc_number}"
fi
}
RESIZE2FS="$(which resize2fs)"
DM_BLOCK_DEVICE="/dev/dm-"
EMMC_BLOCK_DEVICE="$(get_emmc_block_device)"
if [ -x "${RESIZE2FS}" -a -n "${EMMC_BLOCK_DEVICE}" ]; then
PARTITIONS="$(blkid | sed -ne "{s,\(^${EMMC_BLOCK_DEVICE}[^:]\+\):.*TYPE=\"ext4\".*,\1,g;T;p}" | sort -u)"
# Add possible device mapper devices
PARTITIONS="${PARTITIONS} $(blkid | sed -ne "{s,\(^${DM_BLOCK_DEVICE}[^:]\+\):.*TYPE=\"ext4\".*,\1,g;T;p}" | sort -u)"
for i in ${PARTITIONS}; do
if ! ${RESIZE2FS} ${i} 2>/dev/null; then
echo "ERROR: resize2fs ${i}"
fi
done
fi
} }
CONFFILES_${PN} += "${sysconfdir}/sysctl.conf" CONFFILES_${PN} += "${sysconfdir}/sysctl.conf"