From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6516773995002462208 X-Received: by 10.46.2.69 with SMTP id 66mr314695ljc.23.1517304683550; Tue, 30 Jan 2018 01:31:23 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.25.202.87 with SMTP id h23ls349692lfj.0.gmail; Tue, 30 Jan 2018 01:31:22 -0800 (PST) X-Google-Smtp-Source: AH8x226XWIvZuJSp+dzulvqwxLgXo5sqet/TaGPJxk9zgigRyWUF0gKOfKgPaLb1NOqcr45sHjXs X-Received: by 10.25.15.74 with SMTP id e71mr2142371lfi.22.1517304682741; Tue, 30 Jan 2018 01:31:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517304682; cv=none; d=google.com; s=arc-20160816; b=c2HP7WD0VT2bfyYCpvtTUB0rGNAOLn0zGC5SpwNnoKVEMFvgkj+XJF00uIwvKL1XXG W3hWW5VBvjhY8QnGaaYrHmJ4tJqrX18Zgig9FNbNMJqrz3H97flMnTu9gllhPOPPwOA+ CLUXnsKuxMg0oVDAY6AjhusaKohI5g2GVtLhvvBLRv+Htq64wa/qR3VAhjpTNUHfLBOx 3beK0bOC8v4oLf8fe9BTKo/oqqwMBVInLCK403MgHdxS52ZSZWZGAPAaDGne7GToCqcO worT2XINKnJBUvoxjc4DZiOLAmC3BpZSoOH6l9Zfcdh9TEgWdrDsrETuU01L9RPAJ3R1 +whw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:subject:from:to:arc-authentication-results; bh=bWhPRvROFfOXJ+/lwqExJ6K4YcI+o+LdvycC3XaRcus=; b=EeB5CJvnq9llhA6cxvnjyOSyvCpJqGi4Vssl/n8rqtg1TwDUFMFoRHlfyMQdbu6grB 58MZ9lzNF1PIBhmGSLAsdaPloBswCDC4uHaDPN1Rv2eAuQsvx9Io7vphr7gHz9iLbCSd /r3ucGeJwLHoUw7sZX0TjKx8zLSBlVttkgk2pZlNOluFctwMCrB7cymKdPzVErWTvqnJ EbJtFxlYoYBGsdaL07LCVmyQHa9DwpeXn8qpHl7rO3xdJJ82gSPn5PtyqLbRKwCAq7wr j87WCUAAOoDEyDVWoAUaApFcNZoAYkKtEK87UwHV2P//jWKO0nPHhWkuqkaB1U15rWjl 7ISQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id z11si511730ljc.3.2018.01.30.01.31.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Jan 2018 01:31:22 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@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 jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=jan.kiszka@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 w0U9VL50017049 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 30 Jan 2018 10:31:22 +0100 Received: from [167.87.54.255] ([167.87.54.255]) by mail1.siemens.de (8.15.2/8.15.2) with ESMTP id w0U9VL7A012959 for ; Tue, 30 Jan 2018 10:31:21 +0100 To: isar-users From: Jan Kiszka Subject: [PATCH] Install /dev/null in rootfs Message-ID: <14fbc8f0-b5dd-afd0-bd73-1592f6ee05ca@siemens.com> Date: Tue, 30 Jan 2018 10:31:21 +0100 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: yBHSdQNlnEUC From: Jan Kiszka ...or hell breaks loose, at least in the buildchroot: x86 kernel builds will generate strange modules.order/builtin files. That's because drivers/firmware/Makefile does $(call as-instr,.arch armv7-a\n.arch_extension sec,-DREQUIRES_SEC=1) That tries the above assembly on the x86 gcc which will not understand it and complain. It's output is directed to /dev/null, but that does not exist, so it will be printed to the above modules.* files. Argh. Who knows what may happen in the image rootfs, so update it as well. Which reminds us that this ugly duplication should be resolved ASAP. Signed-off-by: Jan Kiszka --- .../files/{download_dev-random => download_dev-nodes} | 7 +++++++ meta-isar/recipes-core/images/isar-image-base.bb | 4 ++-- meta/recipes-devtools/buildchroot/buildchroot.bb | 4 ++-- .../recipes-devtools/buildchroot/files/download_dev-nodes | 7 +++++++ meta/recipes-devtools/buildchroot/files/download_dev-random | 13 ------------- 5 files changed, 18 insertions(+), 17 deletions(-) copy meta-isar/recipes-core/images/files/{download_dev-random => download_dev-nodes} (73%) rename meta-isar/recipes-core/images/files/download_dev-random => meta/recipes-devtools/buildchroot/files/download_dev-nodes (73%) delete mode 100644 meta/recipes-devtools/buildchroot/files/download_dev-random diff --git a/meta-isar/recipes-core/images/files/download_dev-random b/meta-isar/recipes-core/images/files/download_dev-nodes similarity index 73% copy from meta-isar/recipes-core/images/files/download_dev-random copy to meta-isar/recipes-core/images/files/download_dev-nodes index f7f5fe5..3149faa 100644 --- a/meta-isar/recipes-core/images/files/download_dev-random +++ b/meta-isar/recipes-core/images/files/download_dev-nodes @@ -7,6 +7,13 @@ set -e readonly ROOTFS="$1" +if [ ! -c ${ROOTFS}/dev/null ]; then + rm -f ${ROOTFS}/dev/null + mknod "${ROOTFS}/dev/null" c 1 3 + chmod 666 "${ROOTFS}/dev/null" + chown 0:0 "${ROOTFS}/dev/null" +fi + if [ ! -c ${ROOTFS}/dev/random ]; then rm -f ${ROOTFS}/dev/random mknod "${ROOTFS}/dev/random" c 1 8 diff --git a/meta-isar/recipes-core/images/isar-image-base.bb b/meta-isar/recipes-core/images/isar-image-base.bb index 2f03cd1..3954697 100644 --- a/meta-isar/recipes-core/images/isar-image-base.bb +++ b/meta-isar/recipes-core/images/isar-image-base.bb @@ -12,7 +12,7 @@ FILESPATH =. "${LAYERDIR_isar}/recipes-core/images/files:" SRC_URI = "file://multistrap.conf.in \ file://${DISTRO_CONFIG_SCRIPT} \ file://setup.sh \ - file://download_dev-random" + file://download_dev-nodes" PV = "1.0" @@ -38,7 +38,7 @@ do_rootfs() { chmod +x "${WORKDIR}/${DISTRO_CONFIG_SCRIPT}" chmod +x "${WORKDIR}/setup.sh" - install -m 755 "${WORKDIR}/download_dev-random" "${WORKDIR}/hooks_multistrap/" + install -m 755 "${WORKDIR}/download_dev-nodes" "${WORKDIR}/hooks_multistrap/" # Multistrap accepts only relative path in configuration files, so get it: cd ${TOPDIR} diff --git a/meta/recipes-devtools/buildchroot/buildchroot.bb b/meta/recipes-devtools/buildchroot/buildchroot.bb index 51f9d5d..8743a02 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot.bb +++ b/meta/recipes-devtools/buildchroot/buildchroot.bb @@ -12,7 +12,7 @@ FILESPATH =. "${LAYERDIR_core}/recipes-devtools/buildchroot/files:" SRC_URI = "file://multistrap.conf.in \ file://configscript.sh \ file://setup.sh \ - file://download_dev-random \ + file://download_dev-nodes \ file://build.sh" PV = "1.0" @@ -39,7 +39,7 @@ do_build() { chmod +x "${WORKDIR}/setup.sh" chmod +x "${WORKDIR}/configscript.sh" - install -m 755 "${WORKDIR}/download_dev-random" "${WORKDIR}/hooks_multistrap/" + install -m 755 "${WORKDIR}/download_dev-nodes" "${WORKDIR}/hooks_multistrap/" # Multistrap accepts only relative path in configuration files, so get it: cd ${TOPDIR} diff --git a/meta-isar/recipes-core/images/files/download_dev-random b/meta/recipes-devtools/buildchroot/files/download_dev-nodes similarity index 73% rename from meta-isar/recipes-core/images/files/download_dev-random rename to meta/recipes-devtools/buildchroot/files/download_dev-nodes index f7f5fe5..3149faa 100644 --- a/meta-isar/recipes-core/images/files/download_dev-random +++ b/meta/recipes-devtools/buildchroot/files/download_dev-nodes @@ -7,6 +7,13 @@ set -e readonly ROOTFS="$1" +if [ ! -c ${ROOTFS}/dev/null ]; then + rm -f ${ROOTFS}/dev/null + mknod "${ROOTFS}/dev/null" c 1 3 + chmod 666 "${ROOTFS}/dev/null" + chown 0:0 "${ROOTFS}/dev/null" +fi + if [ ! -c ${ROOTFS}/dev/random ]; then rm -f ${ROOTFS}/dev/random mknod "${ROOTFS}/dev/random" c 1 8 diff --git a/meta/recipes-devtools/buildchroot/files/download_dev-random b/meta/recipes-devtools/buildchroot/files/download_dev-random deleted file mode 100644 index 5b5b96b..0000000 --- a/meta/recipes-devtools/buildchroot/files/download_dev-random +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -set -e - -readonly ROOTFS="$1" - -mknod "${ROOTFS}/dev/random" c 1 8 -chmod 640 "${ROOTFS}/dev/random" -chown 0:0 "${ROOTFS}/dev/random" - -mknod "${ROOTFS}/dev/urandom" c 1 9 -chmod 640 "${ROOTFS}/dev/urandom" -chown 0:0 "${ROOTFS}/dev/urandom" -- 2.13.6