diff --git a/meta-digi-dey/recipes-core/base-files/base-files/resize-ext4fs.sh b/meta-digi-dey/recipes-core/base-files/base-files/resize-ext4fs.sh deleted file mode 100755 index 74ce0a3f3..000000000 --- a/meta-digi-dey/recipes-core/base-files/base-files/resize-ext4fs.sh +++ /dev/null @@ -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 diff --git a/meta-digi-dey/recipes-core/base-files/base-files_3.0.14.bbappend b/meta-digi-dey/recipes-core/base-files/base-files_3.0.14.bbappend index 609e18220..663657f08 100644 --- a/meta-digi-dey/recipes-core/base-files/base-files_3.0.14.bbappend +++ b/meta-digi-dey/recipes-core/base-files/base-files_3.0.14.bbappend @@ -1,4 +1,4 @@ -# Copyright (C) 2013 Digi International. +# Copyright (C) 2013-2018 Digi International. FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" @@ -6,15 +6,34 @@ SRC_URI += " \ file://sysctl.conf \ " -SRC_URI_append_ccimx6 = " file://resize-ext4fs.sh" - do_install_append() { install -m 0644 ${WORKDIR}/sysctl.conf ${D}${sysconfdir}/ } -do_install_append_ccimx6() { - install -d ${D}${sysconfdir}/${IMAGE_PKGTYPE}-postinsts - install -m 0755 ${WORKDIR}/resize-ext4fs.sh ${D}${sysconfdir}/${IMAGE_PKGTYPE}-postinsts/ +pkg_postinst_${PN}_ccimx6() { + 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 } CONFFILES_${PN} += "${sysconfdir}/sysctl.conf"