From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6527637623433854976 X-Received: by 10.80.202.11 with SMTP id d11mr5677211edi.9.1519834069158; Wed, 28 Feb 2018 08:07:49 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.80.158.236 with SMTP id a99ls2369193edf.7.gmail; Wed, 28 Feb 2018 08:07:48 -0800 (PST) X-Google-Smtp-Source: AH8x224rhC2+oyN4YWhtloiLYKn+dMxEMhxh1EnJ7wSep9ZWV0ooFrfRHzKtzeyXb/gEBC79FV0G X-Received: by 10.80.200.202 with SMTP id k10mr5497934edh.10.1519834068544; Wed, 28 Feb 2018 08:07:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519834068; cv=none; d=google.com; s=arc-20160816; b=tDwc/ZdOJMAZFq75UAJE7jFXT4+jBiEuwJjEDOL3ZJWMA5GXupvZXFqTJBcC43dIb0 B1QE5oEIPF9M6bZQWBQFyU38xvCVslE8U1B4oqwerYuTnTraXSekfEYB5l7+MP4aAMsr VfAgJ6DmsOVVHbaJDervo6lC/uJekdlUuPBQ0LgNfcIZwFhYp2BWGURQN+HPM9dUcY8U cu6RnesugMTJ9/xAPjkn1Q10RxiFpoe2gonxS2yixZQ4U6X48vmpL4aWX61s55wFxLaw L+obzTLkriHp0ea71LDDjHdybIaXorIlYOPM+QLnJWw6QnLKWrV3Q4XYut6BnJFaUJ2C ZjAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=9b46YmXVk815if361XZ2tWTSxko9wFjiNxnXL1Zp3Mk=; b=XQ4mPvFkiyG/Fx52SL9Jf4tFbfaAaASw7TfIR5o0whapR3RuS2oMyuYOJvTK1tQ3Vy H/txaTX0ccjsE4+jIBbHghWfDZ8WBuQccVJmEcchcE6Vtc07Q3JNoiILPyiDlgL6Ngrk t30nLwdgXHqGlftvMFTTntfaX1gn22FkBSAv1ajb49xyDhyCSF2DZwdIBCyDgd57F6+g wg/hWlrphAUepkcKVACrGRGtw7qGzQ2xzDNmm39qwcSP1oa+M8/sv119lFBiPtoahhgF cwl4N/yO+jCidpr2T8Afp10dneUC+Bnm+pApFvYwza82Tojfiwrz4A9YGqHjmOe5uKsP 2cAg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id h9si103798edi.4.2018.02.28.08.07.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Feb 2018 08:07:48 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail1.siemens.de (mail1.siemens.de [139.23.33.14]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id w1SG7mFT025043 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 28 Feb 2018 17:07:48 +0100 Received: from md1pvb1c.ad001.siemens.net (md1pvb1c.ad001.siemens.net [139.25.68.40] (may be forged)) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w1SG7lwT003587; Wed, 28 Feb 2018 17:07:47 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH] images: base-image: pass ROOTFS_TYPE to fstab generator in configscript Date: Wed, 28 Feb 2018 17:07:46 +0100 Message-Id: <20180228160746.5528-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.16.1 X-TUID: BdNreGo57kGq When not using ext4-img the hardcoded /etc/fstab is actually wrong. To allow poeple to implement their own imager classes, allow to control the type. Signed-off-by: Henning Schild --- meta-isar/recipes-core/images/files/debian-configscript.sh | 3 ++- meta-isar/recipes-core/images/files/raspbian-configscript.sh | 3 ++- meta-isar/recipes-core/images/isar-image-base.bb | 4 ++-- meta/classes/ext4-img.bbclass | 2 ++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/meta-isar/recipes-core/images/files/debian-configscript.sh b/meta-isar/recipes-core/images/files/debian-configscript.sh index 33b2b53..f2fa2d9 100755 --- a/meta-isar/recipes-core/images/files/debian-configscript.sh +++ b/meta-isar/recipes-core/images/files/debian-configscript.sh @@ -8,6 +8,7 @@ set -e readonly MACHINE_SERIAL="$1" readonly BAUDRATE_TTY="$2" readonly ROOTFS_DEV="$3" +readonly ROOTFS_TYPE="$4" cat >> /etc/default/locale << EOF LANG=en_US.UTF-8 @@ -51,7 +52,7 @@ grep "root:\*:" /etc/shadow && echo "root:root" | chpasswd cat > /etc/fstab << EOF # Begin /etc/fstab -/dev/$ROOTFS_DEV / ext4 defaults 1 1 +/dev/$ROOTFS_DEV / $ROOTFS_TYPE defaults 1 1 proc /proc proc nosuid,noexec,nodev 0 0 sysfs /sys sysfs nosuid,noexec,nodev 0 0 devpts /dev/pts devpts gid=5,mode=620 0 0 diff --git a/meta-isar/recipes-core/images/files/raspbian-configscript.sh b/meta-isar/recipes-core/images/files/raspbian-configscript.sh index 4cb004b..1a85c40 100644 --- a/meta-isar/recipes-core/images/files/raspbian-configscript.sh +++ b/meta-isar/recipes-core/images/files/raspbian-configscript.sh @@ -8,6 +8,7 @@ set -e readonly MACHINE_SERIAL="$1" readonly BAUDRATE_TTY="$2" readonly ROOTFS_DEV="$3" +readonly ROOTFS_TYPE="$4" cat >> /etc/default/locale << EOF LANG=en_US.UTF-8 @@ -55,7 +56,7 @@ grep "root:\*:" /etc/shadow && echo "root:root" | chpasswd cat > /etc/fstab << EOF # Begin /etc/fstab -/dev/$ROOTFS_DEV / ext4 defaults 1 1 +/dev/$ROOTFS_DEV / $ROOTFS_TYPE defaults 1 1 proc /proc proc nosuid,noexec,nodev 0 0 sysfs /sys sysfs nosuid,noexec,nodev 0 0 devpts /dev/pts devpts gid=5,mode=620 0 0 diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb index b444258..80cb666 100644 --- a/meta-isar/recipes-core/images/isar-image-base.bb +++ b/meta-isar/recipes-core/images/isar-image-base.bb @@ -69,8 +69,8 @@ do_rootfs() { sudo -E multistrap -a ${DISTRO_ARCH} -d "${IMAGE_ROOTFS}" -f "${WORKDIR}/multistrap.conf" # Configure root filesystem - sudo chroot ${IMAGE_ROOTFS} /${DISTRO_CONFIG_SCRIPT} ${MACHINE_SERIAL} ${BAUDRATE_TTY} \ - ${ROOTFS_DEV} + sudo chroot ${IMAGE_ROOTFS} /${DISTRO_CONFIG_SCRIPT} ${MACHINE_SERIAL} \ + ${BAUDRATE_TTY} ${ROOTFS_DEV} ${ROOTFS_TYPE} sudo rm "${IMAGE_ROOTFS}/${DISTRO_CONFIG_SCRIPT}" sudo umount ${IMAGE_ROOTFS}/proc 2>/dev/null || true diff --git a/meta/classes/ext4-img.bbclass b/meta/classes/ext4-img.bbclass index 83cb137..8a978e6 100644 --- a/meta/classes/ext4-img.bbclass +++ b/meta/classes/ext4-img.bbclass @@ -4,6 +4,8 @@ # Extra space for rootfs in MB ROOTFS_EXTRA ?= "64" +ROOTFS_TYPE = "ext4" + EXT4_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${PN}-${DISTRO}-${MACHINE}.ext4.img" do_ext4_image[stamp-extra-info] = "${DISTRO}-${MACHINE}" -- 2.16.1