From patchwork Sun Oct 13 00:22:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1175776 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="S0mGhdX3"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46rMpp6pqKz9sP6 for ; Sun, 13 Oct 2019 11:22:56 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 13C0020483; Sun, 13 Oct 2019 00:22:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QND+qGgjFa96; Sun, 13 Oct 2019 00:22:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 29AD12076E; Sun, 13 Oct 2019 00:22:50 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 0F1191BF95E for ; Sun, 13 Oct 2019 00:22:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0C16F8701E for ; Sun, 13 Oct 2019 00:22:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id H-kxxlKjiqf9 for ; Sun, 13 Oct 2019 00:22:48 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) by whitealder.osuosl.org (Postfix) with ESMTPS id 4E71D86FEA for ; Sun, 13 Oct 2019 00:22:48 +0000 (UTC) Received: by mail-qk1-f195.google.com with SMTP id u22so12389505qkk.11 for ; Sat, 12 Oct 2019 17:22:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RDaM1Ve1klToLIkpo9LgkzBmG9owU66QzMyLhLdbFJc=; b=S0mGhdX3QG68DL3O4hP7k4dIRrOYZjVykdT0wAQU7K57Fp0RuM3HrBHRqgWaRIEP52 m+5VYcgVJAewAbrtUp77g4/Qjw2CDq1r+hnYFd2sL/D9GOhGpUdDz7wIzUJw7Ilo0TN7 jI5B10/zKeebtL5z5w2pr59mWuanbTacHkT9WiIcun2EaKTsRDVeWu6tjpjNqaoeNK5Q VOEkkVI+thqmGPpknCGObQz/ZqyARnddE7be7iH0VbK/ejmg2Oc0l8MbgEokUPRDfCuh t05LolHKIhBHOzYSMBmmGjPtz59ctzW+Y3BlOkA6xOZWrY0TlyRZ2aA80Nr02O3u53jK PD8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RDaM1Ve1klToLIkpo9LgkzBmG9owU66QzMyLhLdbFJc=; b=trOVTKa7k8N5wfNTGIy7ikEch2285Oacg/udnPde2RvAmWbduFtL1uT/KlwApvRSXV KY0N+BfcoReQkKMuw7nVIm0E5kH1vYhvVEOXqGEiwMy6fxkcA7b0Vw+XoPdDkW0BcOOV lej7xrmEjX1CI/zFbRzlKsufUqW5DlxLIRwNSUABsDM4uqctbSPEjqA+5tONilAU3Pi4 oI0INLxjtogaHeaQn6vCK1W7YdGYkVPn0r/YeKqNMBwtFprj7BT/1SsatdiwmgQ6hIWh 6GI9GxV08+fpbZHHDdFtsL60zkGpM3ryT9Vt2k3Gg8Yjz+/R098lCU+MWsQRDFBILqzr S0pQ== X-Gm-Message-State: APjAAAVYR/cfkhl6BxfdAFvxrzEeVPnYvRJ8uo1caU02UQUr3O78jQp1 o/P2hNk9hTeaxoCH8nOJFx688ZVDdT4= X-Google-Smtp-Source: APXvYqxl1Dhcy+MEx4FFRgIdRfymkWs1ykqWBdzHQoGye7QTnS/FhTOY2qhz7ZXzrKH1xowdIg3IBg== X-Received: by 2002:a37:8dc2:: with SMTP id p185mr23530702qkd.7.1570926167043; Sat, 12 Oct 2019 17:22:47 -0700 (PDT) Received: from casantos.remote.csb (177.204.230.17.dynamic.adsl.gvt.net.br. [177.204.230.17]) by smtp.gmail.com with ESMTPSA id k54sm9373533qtf.28.2019.10.12.17.22.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Oct 2019 17:22:46 -0700 (PDT) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Sat, 12 Oct 2019 21:22:24 -0300 Message-Id: <20191013002232.1045-2-unixmania@gmail.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20191013002232.1045-1-unixmania@gmail.com> References: <20191013002232.1045-1-unixmania@gmail.com> Subject: [Buildroot] [PATCH 1/9] support/scripts/genimage.sh: pass an empty rootpath to genimage X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Carlos Santos , Peter Korsgaard , Peter Seiderer , Fabio Estevam , Martin Bark MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Carlos Santos genimage makes a full copy of the given rootpath to ${GENIMAGE_TMP}/root so passing TARGET_DIR would be a waste of time and disk space. We don't rely on genimage to build the rootfs image, just to insert a pre-built one in the disk image. Signed-off-by: Carlos Santos --- support/scripts/genimage.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/support/scripts/genimage.sh b/support/scripts/genimage.sh index 039b3fef1d..2796e19eb7 100755 --- a/support/scripts/genimage.sh +++ b/support/scripts/genimage.sh @@ -30,10 +30,18 @@ done [ -n "${GENIMAGE_CFG}" ] || die "Missing argument" +# Pass an empty rootpath. genimage makes a full copy of the given rootpath to +# ${GENIMAGE_TMP}/root so passing TARGET_DIR would be a waste of time and disk +# space. We don't rely on genimage to build the rootfs image, just to insert a +# pre-built one in the disk image. + +trap 'rm -rf "${ROOTPATH_TMP}"' EXIT +ROOTPATH_TMP="$(mktemp -d)" + rm -rf "${GENIMAGE_TMP}" genimage \ - --rootpath "${TARGET_DIR}" \ + --rootpath "${ROOTPATH_TMP}" \ --tmppath "${GENIMAGE_TMP}" \ --inputpath "${BINARIES_DIR}" \ --outputpath "${BINARIES_DIR}" \ From patchwork Sun Oct 13 00:22:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1175775 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="eUQK7C+e"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46rMpp4gsCz9s7T for ; Sun, 13 Oct 2019 11:22:58 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9AE6786FEA; Sun, 13 Oct 2019 00:22:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HKwHWLA5EbpL; Sun, 13 Oct 2019 00:22:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 23BE88701E; Sun, 13 Oct 2019 00:22:54 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id A8C0D1BF95E for ; Sun, 13 Oct 2019 00:22:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A5BEA87FA4 for ; Sun, 13 Oct 2019 00:22:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rU7CE-OlQ3nQ for ; Sun, 13 Oct 2019 00:22:52 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt1-f172.google.com (mail-qt1-f172.google.com [209.85.160.172]) by hemlock.osuosl.org (Postfix) with ESMTPS id EC59C87F84 for ; Sun, 13 Oct 2019 00:22:51 +0000 (UTC) Received: by mail-qt1-f172.google.com with SMTP id u40so19621690qth.11 for ; Sat, 12 Oct 2019 17:22:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kg3p2qVm8RxcnShhbuClG4ZLb+uKg7qfCCZFQQsBKzY=; b=eUQK7C+e3QBy/BKUpc/quEx0mRUx8lj2IsNWirdwtCHBbKl54+ydh1k68OmumhbUzC QQczaeSB41E/ERvJ+E/NPJAjb5y5GkN4HIji38CRtO3w+/FYzdDJ8XZqWR8pj9dnzYLP /FIzk9QqW2MxwyPpG5JjLUuTEkVv51qv2n/+FhQ65G6xcz5mpK8d3H00YctbSm5aWRpH ogYEaESHL6tFdfz5/MSkgkThX8Wk/e6ccPbWYrsIe0Vmcz6rfBRDAIrt3drViZvr1vew 31wR8BonD24g7DghblnTUu4xvR6tgNN+uuAHG3jTdRFij4vKCixYOSqeXe79BYJAaW9I Zy5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=kg3p2qVm8RxcnShhbuClG4ZLb+uKg7qfCCZFQQsBKzY=; b=irm6mC19v7yWVuNh5cBkeyuvHpXg1wYxjQOE0MspGnrAVAh354Ws8pWbwZ//c6YL7v wxqcFemS/NgA8RMP5m2Dsu9/78UmtmBvRT/oGuJzTre8/302dNDLbNjtnoYqHODLRZRk XPeBP1uv6UkktHt2E5cZVi3afNEHZ7Rwe0d9rwcS9R0xzol138Qef3JTHsIHaaVxRJCz sutLgxG9wmniqbJAm6y9Xq62bScgPPX+GnY48GXv+OUUzQayNxWnGoQXJr2Wf4bYiILI 93jFezGxjG8/WBT42bx9Hh4a9xPhG3qhiYx7bp7sSmsBNbl97swwkuqWS/OmZwNY5yMo t2tQ== X-Gm-Message-State: APjAAAVDYeMdiYDeibk8jOkAcLTuqIEwH6/B+HFnahA6KTKqWZCCAmon nCuqG23j9CNhJemkJ7vPcVv7Z5lZR1Q= X-Google-Smtp-Source: APXvYqxYkCvDFff0w0pzq3yOcUBw7F+h4i7nSUkc6soV25673KNh55/HfOKt9p6MnLZGHtFMwTor/A== X-Received: by 2002:ac8:16eb:: with SMTP id y40mr25565101qtk.67.1570926170724; Sat, 12 Oct 2019 17:22:50 -0700 (PDT) Received: from casantos.remote.csb (177.204.230.17.dynamic.adsl.gvt.net.br. [177.204.230.17]) by smtp.gmail.com with ESMTPSA id k54sm9373533qtf.28.2019.10.12.17.22.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Oct 2019 17:22:50 -0700 (PDT) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Sat, 12 Oct 2019 21:22:25 -0300 Message-Id: <20191013002232.1045-3-unixmania@gmail.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20191013002232.1045-1-unixmania@gmail.com> References: <20191013002232.1045-1-unixmania@gmail.com> Subject: [Buildroot] [PATCH 2/9] configs/beagleboardx15: drop custom post-image script X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Carlos Santos , Peter Korsgaard , Peter Seiderer , Fabio Estevam , Martin Bark MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Carlos Santos Use support/scripts/genimage.sh, instead, which prevents duplicating TARGET_DIR under ${BUILD_DIR}/genimage.tmp/root. Signed-off-by: Carlos Santos --- board/beagleboardx15/post-image.sh | 15 --------------- configs/beagleboardx15_defconfig | 3 ++- 2 files changed, 2 insertions(+), 16 deletions(-) delete mode 100755 board/beagleboardx15/post-image.sh diff --git a/board/beagleboardx15/post-image.sh b/board/beagleboardx15/post-image.sh deleted file mode 100755 index f52682f5d5..0000000000 --- a/board/beagleboardx15/post-image.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" - -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" diff --git a/configs/beagleboardx15_defconfig b/configs/beagleboardx15_defconfig index 393b29eef0..039a07b11e 100644 --- a/configs/beagleboardx15_defconfig +++ b/configs/beagleboardx15_defconfig @@ -1,7 +1,8 @@ BR2_arm=y BR2_cortex_a15=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beagleboardx15/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beagleboardx15/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.9" From patchwork Sun Oct 13 00:22:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1175778 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="PCaPs4WA"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46rMpt2VhZz9s7T for ; Sun, 13 Oct 2019 11:23:01 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0789B87F84; Sun, 13 Oct 2019 00:23:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id w22IEcEM3H+m; Sun, 13 Oct 2019 00:22:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 17FBA87FA4; Sun, 13 Oct 2019 00:22:59 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 72A3C1BF95E for ; Sun, 13 Oct 2019 00:22:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6B76387FA4 for ; Sun, 13 Oct 2019 00:22:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dZlSi5Mkp+FW for ; Sun, 13 Oct 2019 00:22:55 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) by hemlock.osuosl.org (Postfix) with ESMTPS id 801FD87F84 for ; Sun, 13 Oct 2019 00:22:55 +0000 (UTC) Received: by mail-qt1-f193.google.com with SMTP id n17so294529qtr.4 for ; Sat, 12 Oct 2019 17:22:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kfshLHCppcGDFvm2SnoEJ6xfW0KpJgRazc9NocnhKTM=; b=PCaPs4WAbNmo48X/UvZ4rlvuMXYLusxrr+N+JlQnKMY+213ERy/X2Y4RAeMisLyXml n5wpwESJ+epgj2ftLQKg2ecVmOcpeep8UDhsF70RdF8VwVRoikDalKcGcgfXy0ZpGG/6 q5BD+qo+/pAInqxIHg9SHd3cfcba+sgiffXXe2hw+JUP2YymortH5codp4tZpnqzr6/p SoDL2Cpl6Yk7O/Je0DHQt/T5y7Xfm8BflOUEEHRT3Fuhvgam5OBBYj6AilQFoDKkm/Zd j2/UVw712dj+rfKTOsHEaXJ66ucZP3vuR/a5/ZnXuaVKR2+pGLVtB5Sn1k9X9GNi7Xld h1MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=kfshLHCppcGDFvm2SnoEJ6xfW0KpJgRazc9NocnhKTM=; b=LmYpLFQp+mcFDCFp1s8TYRboVgT0hevYnRaDv6Xy2qv5MJbqGTGnEQpwW49h04OD0D bVxk+UND640GCEL9RkpHOkjebSvjM5u7e/b3QuwjZuSo+NGPi3teSqS/OSUH8BYGy0hI KPRZ3P0C59/1hirbn4xzYKvqyT//gFGV0PtgjA2sadVGGISTvix4RXNvx127lxykrp3m STBHotBH33j+WBJ+r4j40lUDDE5Hf53l7lX7+zRFMl4nuCluH9TDeyEtvlPhi8Xh38Zu bFi0JdrlpmbQqgNkDWV8E6LQBSnTgBL22qwyaLwEVeDNaZNQzFcEFaUkeI7/jKYUGKjn l96w== X-Gm-Message-State: APjAAAUJ053VfVhEFOJ4kP7XfCaBlXNBvVp0wsMKsvINfjzBvZaajVjD 93Imq33QXcxXGCmXKbl8VhFwHOXWubc= X-Google-Smtp-Source: APXvYqyqb17sMfMWe8Ned5Y3Hzlt1NvUhesA/3+IZcG08SPuCFJGtmJSC8eM+X1iLEbA+nqaMkGG5A== X-Received: by 2002:a0c:94af:: with SMTP id j44mr23728060qvj.230.1570926174321; Sat, 12 Oct 2019 17:22:54 -0700 (PDT) Received: from casantos.remote.csb (177.204.230.17.dynamic.adsl.gvt.net.br. [177.204.230.17]) by smtp.gmail.com with ESMTPSA id k54sm9373533qtf.28.2019.10.12.17.22.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Oct 2019 17:22:53 -0700 (PDT) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Sat, 12 Oct 2019 21:22:26 -0300 Message-Id: <20191013002232.1045-4-unixmania@gmail.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20191013002232.1045-1-unixmania@gmail.com> References: <20191013002232.1045-1-unixmania@gmail.com> Subject: [Buildroot] [PATCH 3/9] configs/beaglebone: don't use custom post-image script X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Carlos Santos , Peter Korsgaard , Peter Seiderer , Fabio Estevam , Martin Bark MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Carlos Santos Use support/scripts/genimage.sh, instead, which prevents duplicating TARGET_DIR under ${BUILD_DIR}/genimage.tmp/root. Use a post-build script to copy uEnv.txt to BINARIES_DIR, as made for beagleboneai. Keep the post-image script because it is still used by beaglebone_qt5. Signed-off-by: Carlos Santos --- This should be made for beaglebone_qt5 too, but it's not possible to test because it' broken since commit a7914499b80r: https://gitlab.com/buildroot.org/buildroot/-/jobs/289126249 --- board/beaglebone/post-build.sh | 4 ++++ configs/beaglebone_defconfig | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100755 board/beaglebone/post-build.sh diff --git a/board/beaglebone/post-build.sh b/board/beaglebone/post-build.sh new file mode 100755 index 0000000000..ffdd19138c --- /dev/null +++ b/board/beaglebone/post-build.sh @@ -0,0 +1,4 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" + +cp $BOARD_DIR/uEnv.txt $BINARIES_DIR/uEnv.txt diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig index d88b4253ef..ee97f80322 100644 --- a/configs/beaglebone_defconfig +++ b/configs/beaglebone_defconfig @@ -2,7 +2,9 @@ BR2_arm=y BR2_cortex_a8=y BR2_GLOBAL_PATCH_DIR="board/beaglebone/patches" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglebone/post-image.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/beaglebone/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/beaglebone/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="git://git.ti.com/processor-sdk/processor-sdk-linux.git" From patchwork Sun Oct 13 00:22:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1175779 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="nRt7fJ5l"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46rMq15Wwlz9s7T for ; Sun, 13 Oct 2019 11:23:09 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 46DEF88072; Sun, 13 Oct 2019 00:23:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rqgFLdPRD8OK; Sun, 13 Oct 2019 00:23:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 6880A8804A; Sun, 13 Oct 2019 00:23:06 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 1107B1BF95E for ; Sun, 13 Oct 2019 00:23:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id F214F2047A for ; Sun, 13 Oct 2019 00:22:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NjFLRGXNyvrs for ; Sun, 13 Oct 2019 00:22:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) by silver.osuosl.org (Postfix) with ESMTPS id 2F12420012 for ; Sun, 13 Oct 2019 00:22:59 +0000 (UTC) Received: by mail-qt1-f193.google.com with SMTP id u40so19621937qth.11 for ; Sat, 12 Oct 2019 17:22:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LbLEz0U9ZYOKe5ISkwDWkoX6stEWK63xm5oIiSjCK18=; b=nRt7fJ5l/R1PkZCauYa6e6UCvyx11PJiVL4gPdhB8T6m3RDtG+4COJyOjL9UobVOFG DSeY+MeyCXG/BQAUKnbVV1Gy9/cOg7E6xToOgiH3Cu0usJYfq/ljjgdb5mHio+sNUxhW KCao1CDutVCUZiIe+QMZnQ7em9x0yohJRni2ZrIyabISsDxkci4FxsoRzpkyQrQhAicy /jIOWyJJqkn6m93StXuyYvUKPRMCYFcJ3LMJo+IQXc6pnrB4T6U5EYiMWvVxpon12vMo s5UUTLkTD/7HuCjKo+lW1VjU12dA+yYxz/xx0A4P9A9rhaICHxoT1eKd44ZFRVhxvkBk LGkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LbLEz0U9ZYOKe5ISkwDWkoX6stEWK63xm5oIiSjCK18=; b=O9kq6lb4hRxwK1n+QaQf6tKzuVT+2iyX1DEj6POHYXW8KuxytWvOAgcMGQQCo5OizR DLQX7yPyjVypBDW9DKkXTZjoCzqc2MXe1/osx7Mh/Q1aDxLyC4l9I4CChpy/EfR68Kkh wZAuBRD+Aq3UK0V5DWsFIN+SFE30VgpAqPvAjXjy2q2NXw9XfAiY5qJFFDG7p6crn2nN MON/p2z2IYPT9t+znSUwYToZPESNnRCUgrDQlkDcqI600h29kHlO4iJKSpQT1G5YX3nf ce135l/VEf2ojrxWO2oZLj3pnFCPgjqN7Gg4DWYfHEWlT4Mc8n2ec4BtE9/UXoCfv+6r 4LdQ== X-Gm-Message-State: APjAAAXMbA0zrD4AE+VfesWl5g6JM1d9p8hS6i8Kb2FCTVQkbpH2Ei2T uK++Gqh8gDnJDUZRLK1n1eLz4rI9N5c= X-Google-Smtp-Source: APXvYqxy4NiJd2T0MsT9S9I7BWeRsH5FZPEqvF3weO8hZPyXpJcvlJnwGH+DNpUqCKiMWOdRebk9sQ== X-Received: by 2002:ac8:1e91:: with SMTP id c17mr25885169qtm.348.1570926178108; Sat, 12 Oct 2019 17:22:58 -0700 (PDT) Received: from casantos.remote.csb (177.204.230.17.dynamic.adsl.gvt.net.br. [177.204.230.17]) by smtp.gmail.com with ESMTPSA id k54sm9373533qtf.28.2019.10.12.17.22.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Oct 2019 17:22:57 -0700 (PDT) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Sat, 12 Oct 2019 21:22:27 -0300 Message-Id: <20191013002232.1045-5-unixmania@gmail.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20191013002232.1045-1-unixmania@gmail.com> References: <20191013002232.1045-1-unixmania@gmail.com> Subject: [Buildroot] [PATCH 4/9] configs/minnowboard_max-graphical: don't use custom post-image script X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Carlos Santos , Peter Korsgaard , Peter Seiderer , Fabio Estevam , Martin Bark MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Carlos Santos Use support/scripts/genimage.sh, instead, which prevents duplicating TARGET_DIR under ${BUILD_DIR}/genimage.tmp/root. Signed-off-by: Carlos Santos --- The defconfig was edited by hand to reduce the turmoild that would result from using "make savedefconfig" --- configs/minnowboard_max-graphical_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/minnowboard_max-graphical_defconfig b/configs/minnowboard_max-graphical_defconfig index 1d043240ad..910c324e25 100644 --- a/configs/minnowboard_max-graphical_defconfig +++ b/configs/minnowboard_max-graphical_defconfig @@ -13,7 +13,8 @@ BR2_TOOLCHAIN_BUILDROOT_WCHAR=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y BR2_ROOTFS_OVERLAY="board/minnowboard/fs-overlay-graphical" BR2_ROOTFS_POST_BUILD_SCRIPT="board/minnowboard/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/minnowboard/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/minnowboard/genimage.cfg" # Host packages BR2_PACKAGE_HOST_DOSFSTOOLS=y From patchwork Sun Oct 13 00:22:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1175780 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HqbTsJsa"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46rMq92WnRz9s7T for ; Sun, 13 Oct 2019 11:23:16 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5622E85F8C; Sun, 13 Oct 2019 00:23:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UCJYCixLXIKk; Sun, 13 Oct 2019 00:23:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8160B85F8D; Sun, 13 Oct 2019 00:23:12 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id B6B2A1BF95E for ; Sun, 13 Oct 2019 00:23:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 9FDD32047A for ; Sun, 13 Oct 2019 00:23:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rHmxHk1XHQbp for ; Sun, 13 Oct 2019 00:23:03 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by silver.osuosl.org (Postfix) with ESMTPS id 2352220012 for ; Sun, 13 Oct 2019 00:23:03 +0000 (UTC) Received: by mail-qt1-f196.google.com with SMTP id r5so19743436qtd.0 for ; Sat, 12 Oct 2019 17:23:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jLJlspD8iRBXV1QTf+ofoJdzXHeY9E416pzhGcWqMIg=; b=HqbTsJsaq2HW40SmyJKPUP07bruEddGA2ZwwpXI5maHEt/NCDdpNE+fmk13zagrcG7 IlllsvJURE/Dm9HQagH8ZhbkmX21JlS/u+PAxpdnQtj+NA2NV8Et717a9I2OvV0tfvSY cmPhSgn4SVtdI4BuscDIYvlp/U1b3lQQpttitJBKVgTE+cvdKMvIy+j5CzDFnYLnQ5sq fMGDbavI6G+ZeXC21t9iXlZ40iQdALqW2OBeRDEUjM/7wrZWQzPbbpYXvLHg+2MqTSBt 7CSYQAzhuG57N1PjqXHhd8AGdvHQsPLzRmVFGNuvqH58Vt1KhjwBZ4I/bQeRwknWd5EX RR+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jLJlspD8iRBXV1QTf+ofoJdzXHeY9E416pzhGcWqMIg=; b=lCnz/uUXDSp1gnzqMopQIh0H9VKadlAVUVw+7RymIMs2Q3MkK5R/UMeb4m13zspBsn JlZ4gfBCC4AZFFE0V2ls5EV/Tohq/2yiFHM/fWM54yr693O85fKNXjOfmybegx6TzFOm leQqo4freppeWzwvYcMAfUUlRTEdnxwn+0zMHLz+fdiWGJEixb1+ED6f5jDt7XgBdwbw 3IpCaormwOJGi9CRo0OwNj2e7WyVdzR4xO8ORUtJ78LyO3RIFQcogL9s1DHoLPWS4YJd GZkT1wSv61yWSjSeRdgNZ38tyzGXPBfY8aFnDeAlRw00GFnvZo5ZJ1I9IWkSN0IABUt8 YxTw== X-Gm-Message-State: APjAAAWMsedZY+SS6PP4UZk5Z7bG/UxrhpKAx21emsa1MKoEnhLTqjs2 WmvkXygBoMdOHMlqYgg5NPwaV8OHdjk= X-Google-Smtp-Source: APXvYqw9KVjbO6NkG/r35qMskY1m2dhI2lNEtB3W89g04Wrql5RQxVSFUrn/UTLjNaCb8asBVZezyw== X-Received: by 2002:ac8:21b5:: with SMTP id 50mr25457999qty.60.1570926181998; Sat, 12 Oct 2019 17:23:01 -0700 (PDT) Received: from casantos.remote.csb (177.204.230.17.dynamic.adsl.gvt.net.br. [177.204.230.17]) by smtp.gmail.com with ESMTPSA id k54sm9373533qtf.28.2019.10.12.17.22.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Oct 2019 17:23:01 -0700 (PDT) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Sat, 12 Oct 2019 21:22:28 -0300 Message-Id: <20191013002232.1045-6-unixmania@gmail.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20191013002232.1045-1-unixmania@gmail.com> References: <20191013002232.1045-1-unixmania@gmail.com> Subject: [Buildroot] [PATCH 5/9] configs/minnowboard_max: drop custom post-image script X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Carlos Santos , Peter Korsgaard , Peter Seiderer , Fabio Estevam , Martin Bark MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Carlos Santos Use support/scripts/genimage.sh, instead, which prevents duplicating TARGET_DIR under ${BUILD_DIR}/genimage.tmp/root. Signed-off-by: Carlos Santos --- The defconfig was edited by hand to reduce the turmoild that would result from using "make savedefconfig" --- board/minnowboard/post-image.sh | 13 ------------- configs/minnowboard_max_defconfig | 3 ++- 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100755 board/minnowboard/post-image.sh diff --git a/board/minnowboard/post-image.sh b/board/minnowboard/post-image.sh deleted file mode 100755 index 428baa5e55..0000000000 --- a/board/minnowboard/post-image.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -e - -GENIMAGE_CFG="board/minnowboard/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" diff --git a/configs/minnowboard_max_defconfig b/configs/minnowboard_max_defconfig index 523ddffd51..fef597c350 100644 --- a/configs/minnowboard_max_defconfig +++ b/configs/minnowboard_max_defconfig @@ -5,7 +5,8 @@ BR2_x86_silvermont=y # Misc BR2_SYSTEM_DHCP="eth0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/minnowboard/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/minnowboard/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/minnowboard/genimage.cfg" # Linux headers same as kernel, a 4.19 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y From patchwork Sun Oct 13 00:22:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1175781 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="D9iw3+Ri"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46rMqD71zwz9s7T for ; Sun, 13 Oct 2019 11:23:20 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id F044C875B4; Sun, 13 Oct 2019 00:23:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 60xImAbb1oa4; Sun, 13 Oct 2019 00:23:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 2B0698704C; Sun, 13 Oct 2019 00:23:16 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 79B081BF95E for ; Sun, 13 Oct 2019 00:23:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 692F68704C for ; Sun, 13 Oct 2019 00:23:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id t8K4S3PCmElL for ; Sun, 13 Oct 2019 00:23:07 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by whitealder.osuosl.org (Postfix) with ESMTPS id CA91687048 for ; Sun, 13 Oct 2019 00:23:06 +0000 (UTC) Received: by mail-qt1-f194.google.com with SMTP id j31so19668247qta.5 for ; Sat, 12 Oct 2019 17:23:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oeVz8mI7i52jm4QoBwYYx75SepQcK+5e+uwoI23qtIg=; b=D9iw3+RigTxTs2K7Kn5JDSgiTycHev/8DaEZ45ULeT/PyZU6zAPYWjOUg8JmzCN/+6 boOT0yZAWbNy+v4mYY0u80y6aBFz8NMvF4y53Nqm3CfRFXp51e5EPsWag7MrfnFzlB/8 j2v1m/h5Sexgin398HIrO6NMtABMCEE8Kqvvc5aTCbBctIu+l6ER3EOMW72+pPF7uX8t lnKyzSyJFEztu0W/nkCVMFps2Za+sgnaty2E4Ygep/eSJ0E4AD7hMKjBMUYr/Btrpsdq yEEJ+EgK6387+i3CMs8E7CvgD4bEOPRC8HY/x689FF3HTrg/UpZy5cnww+iqyyVLKPJM 7H1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=oeVz8mI7i52jm4QoBwYYx75SepQcK+5e+uwoI23qtIg=; b=BaE016vgHgoxhuWNRBY45fypkIbTiWmj9o1rtGQvnB6bODKQ4HQrsl7KL3BXylSmoX 78Eh8YhRmC0sa2hep5CEpVFhUHkjtSuuQn92fa0R/+BloGF4EqXmQApeNfk2cA81iR1e /lvUMunwTepRtz95qwOpGyLn4Rgtpau55YLZpkPsmLB/v1qd21nEOjzzMunT9pRXkev1 inbJ7JaXMf8GMh8vQwHkykbc6q8nRFR0lVp5RrVrTAtzP7T/4lYqnTHQsl9qyPajTvvZ ROXalXVhs2kWngu2XMFgbFSSW51gotG2gW5yTgLfUR6wnYLTeqvRd91hilPIWynTYvoB XZXQ== X-Gm-Message-State: APjAAAWpTY+9lEW+l87PrUWmo0iFfTI5dJVuouL4++ChGtTNPu2Swk6/ aYTs+Ce/p6D/vckSlLbVLOf7aeLpcP0= X-Google-Smtp-Source: APXvYqzxDRHwU1n3rVOLgO68bEGwcgLtFTn5+61mVsTos1XdZec3/37Kvm4nb1ZIwmQw727qSpFw/A== X-Received: by 2002:ac8:6643:: with SMTP id j3mr25115363qtp.125.1570926185572; Sat, 12 Oct 2019 17:23:05 -0700 (PDT) Received: from casantos.remote.csb (177.204.230.17.dynamic.adsl.gvt.net.br. [177.204.230.17]) by smtp.gmail.com with ESMTPSA id k54sm9373533qtf.28.2019.10.12.17.23.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Oct 2019 17:23:05 -0700 (PDT) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Sat, 12 Oct 2019 21:22:29 -0300 Message-Id: <20191013002232.1045-7-unixmania@gmail.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20191013002232.1045-1-unixmania@gmail.com> References: <20191013002232.1045-1-unixmania@gmail.com> Subject: [Buildroot] [PATCH 6/9] configs/pandaboard: drop custom post-image script X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Carlos Santos , Peter Korsgaard , Peter Seiderer , Fabio Estevam , Martin Bark MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Carlos Santos Use support/scripts/genimage.sh, instead, which prevents duplicating TARGET_DIR under ${BUILD_DIR}/genimage.tmp/root. Signed-off-by: Carlos Santos --- board/pandaboard/post-image.sh | 16 ---------------- configs/pandaboard_defconfig | 3 ++- 2 files changed, 2 insertions(+), 17 deletions(-) delete mode 100755 board/pandaboard/post-image.sh diff --git a/board/pandaboard/post-image.sh b/board/pandaboard/post-image.sh deleted file mode 100755 index 9cca1b1789..0000000000 --- a/board/pandaboard/post-image.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" - -exit $? diff --git a/configs/pandaboard_defconfig b/configs/pandaboard_defconfig index bb4dd28783..408bced9c0 100644 --- a/configs/pandaboard_defconfig +++ b/configs/pandaboard_defconfig @@ -6,7 +6,8 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS2" BR2_SYSTEM_DHCP="eth0" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/pandaboard/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pandaboard/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.62" From patchwork Sun Oct 13 00:22:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1175782 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="uNWCjbNe"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46rMqF2tRtz9sP4 for ; Sun, 13 Oct 2019 11:23:21 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id BA5E485F8E; Sun, 13 Oct 2019 00:23:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wXTeA_iWCJ2l; Sun, 13 Oct 2019 00:23:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id DD7E985FA0; Sun, 13 Oct 2019 00:23:18 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 59EDF1BF95E for ; Sun, 13 Oct 2019 00:23:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 49AE42047A for ; Sun, 13 Oct 2019 00:23:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hUFjhTxYgt02 for ; Sun, 13 Oct 2019 00:23:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) by silver.osuosl.org (Postfix) with ESMTPS id 70D5620012 for ; Sun, 13 Oct 2019 00:23:10 +0000 (UTC) Received: by mail-qk1-f195.google.com with SMTP id h126so12407426qke.10 for ; Sat, 12 Oct 2019 17:23:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=buulCCTT5CYW7HUwNscy/KxRCZlZyHJAcNSzIDUVWQs=; b=uNWCjbNeGzqiLtGP+97rMpb7WnBES+njH1dOZU+T5nDduueaq12fD5fXOLLSg8ZTtT tlEvlG+GP+S2ALU5Omq4EMjaFRMWQqXT1tN6krMGkzmlIh3xAApAAgRyCl88DEylrJYK Tga2InI8/evpVHY45h9nZzIeNY359IDoyhZCZ9FQwnDHvl89p1oIVhbG78vT5PYPHWrE wf3GozgUbVPo+BazQCX+JRWG2HxZVkeUw2pCY9t20vu++IsbGDDVLFMi0LByd9YObiyL NPGywWErdnS8pqLQRIcI70ZrZ/ZdoGxvT/VY0wUX0EgsV3KQym8zqvAJnh71m18y+XcH p93g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=buulCCTT5CYW7HUwNscy/KxRCZlZyHJAcNSzIDUVWQs=; b=ulR2PUZRQLiEUGZMwhkiKRkJm/zF+rRq7Pcxc0iflEiX4PTQK6c0tCo6EzaOicyFo7 Na2DmG+d/WzeeVDyIzWrQ/p8ydb7WZ3Kmx/dZ+H0P8G21B4Axnjem+nyYNMuDoe/017f UaKCEXH1VCMGDfLR+JlUwArpZy4M+XCqURzHwO4++ZbCv4b/zE5c6SAsWwSFwGBEl8Qj Wz6oEBCKxugTOA/2I035t8M5eJHiVJGwmTYygzR7WxQ3UNUYjcx+FNx7UWPH7yiSBcg3 QKomJiNgRrF6T07VDfU0swcq7TkFGslpfnX89rwbdNtBVA9oH1ShrWy3UYuijeASTG5e tFCA== X-Gm-Message-State: APjAAAVJIOSCcDiCwk+qCC0d0xVOQ3xmHk7hoiDGlkI1nesRP7GBwUnx o69pL5p+4Rj6ySomZ9uRg09BJvwC1ck= X-Google-Smtp-Source: APXvYqyqdqoY16lYJYlRuirBhY6IpY6BzvSjNro6d3F1kVJzwrXpMZXNAZTDwQbow5Klcs44mnI2Fw== X-Received: by 2002:a37:e503:: with SMTP id e3mr23647189qkg.491.1570926189201; Sat, 12 Oct 2019 17:23:09 -0700 (PDT) Received: from casantos.remote.csb (177.204.230.17.dynamic.adsl.gvt.net.br. [177.204.230.17]) by smtp.gmail.com with ESMTPSA id k54sm9373533qtf.28.2019.10.12.17.23.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Oct 2019 17:23:08 -0700 (PDT) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Sat, 12 Oct 2019 21:22:30 -0300 Message-Id: <20191013002232.1045-8-unixmania@gmail.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20191013002232.1045-1-unixmania@gmail.com> References: <20191013002232.1045-1-unixmania@gmail.com> Subject: [Buildroot] [PATCH 7/9] board/raspberrypi/post-image.sh: pass an empty rootpath to genimage X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Carlos Santos , Peter Korsgaard , Peter Seiderer , Fabio Estevam , Martin Bark MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Carlos Santos genimage makes a full copy of the given rootpath to ${GENIMAGE_TMP}/root so passing TARGET_DIR would be a waste of time and disk space. We don't rely on genimage to build the rootfs image, just to insert a pre-built one in the disk image. Signed-off-by: Carlos Santos --- board/raspberrypi/post-image.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/board/raspberrypi/post-image.sh b/board/raspberrypi/post-image.sh index 70447cd48b..bf9af5dc60 100755 --- a/board/raspberrypi/post-image.sh +++ b/board/raspberrypi/post-image.sh @@ -49,10 +49,18 @@ __EOF__ done +# Pass an empty rootpath. genimage makes a full copy of the given rootpath to +# ${GENIMAGE_TMP}/root so passing TARGET_DIR would be a waste of time and disk +# space. We don't rely on genimage to build the rootfs image, just to insert a +# pre-built one in the disk image. + +trap 'rm -rf "${ROOTPATH_TMP}"' EXIT +ROOTPATH_TMP="$(mktemp -d)" + rm -rf "${GENIMAGE_TMP}" -genimage \ - --rootpath "${TARGET_DIR}" \ +genimage \ + --rootpath "${ROOTPATH_TMP}" \ --tmppath "${GENIMAGE_TMP}" \ --inputpath "${BINARIES_DIR}" \ --outputpath "${BINARIES_DIR}" \ From patchwork Sun Oct 13 00:22:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1175783 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="u4qxt+vU"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46rMqK5RZNz9s7T for ; Sun, 13 Oct 2019 11:23:25 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id F067F20012; Sun, 13 Oct 2019 00:23:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3MUScsNiqaiS; Sun, 13 Oct 2019 00:23:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id D569E2047A; Sun, 13 Oct 2019 00:23:22 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 1542D1BF95E for ; Sun, 13 Oct 2019 00:23:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id E7D1287FD2 for ; Sun, 13 Oct 2019 00:23:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xDL2u+m09s5M for ; Sun, 13 Oct 2019 00:23:14 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) by hemlock.osuosl.org (Postfix) with ESMTPS id 193AB87FA4 for ; Sun, 13 Oct 2019 00:23:14 +0000 (UTC) Received: by mail-qt1-f195.google.com with SMTP id w14so19649162qto.9 for ; Sat, 12 Oct 2019 17:23:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=fVJ3+hc2pKuerQLMTJuAhJ1kRb8XwUshXLoPPclLkr0=; b=u4qxt+vUvOfYNMbVp6P8AQT+3iO0yIpSmiYNKf1AUSv6L/tGsAbd/2kqQJbKHioxkf tkQcd+PUYXBv/e1lURHOzwS0/PSApvYO9yqhsH1gIfVz7CCwGIH3o9oj/bT6L2q8f1qu Y+tTN7s2CWdn6hAPgi8APGatvyvyzHwTNmQkeD0wa07cGC5jxbHpq/mcILFWFFOtM74D MBuqCYKEgx39fHUfvnaniBFqwwXdnWVR1faURiMPq8bMy4abdK6LBxPuBLX1rpyCqA4T x6JSSHSfeioYZs4IOM+2+bZmrKmY/9jd+p34Nxjj1hwDaDJpsUuMQxOoUENIohYSEKxZ lMZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=fVJ3+hc2pKuerQLMTJuAhJ1kRb8XwUshXLoPPclLkr0=; b=Rvwqqx4Qdxuj76fadtoTdi1jrjfV+aqSD/qmLRFkwN2od8sijQL0wRMdbarY8jh2TT B5XQmvcsSpna7naD3XlbixY28IwLoqbUtDRyHMw/lJ1/L9UGauPkEp6qoc/JxJFqQg6G yD+vEeOWJPTcyunVs+64NPwc9RSObVdZB6ejML7dYnvw6NjpwrCQWxoVu32DMc7gZFVf unvbVUjDTwoW2sV4LY+srIl+cIW6ioR+F/TycKqmF4EzX7xczAkgxziibjagxw839RY1 3NH6U0Xv1oo0rUewXNH/DoWwLT3MMWoo2e1wXwX4oqJLKMKIP6bF3xftE/BBHoaItH7Q MbMQ== X-Gm-Message-State: APjAAAXcYVSpTYxGSIYrJOKYVAPDq1TvQknxgGkBAAmGdXsHwcL4jbrk eqD50WAfjP6crYJKVsozBY/I+4N81Iw= X-Google-Smtp-Source: APXvYqw6NOYIqEuMWL3SQXfe8zf6ekzRpEISINoRgqzYUDoo8/GZFK1JBQic42Ly0plnzm6Iw+7g0Q== X-Received: by 2002:ac8:f03:: with SMTP id e3mr25724061qtk.231.1570926192864; Sat, 12 Oct 2019 17:23:12 -0700 (PDT) Received: from casantos.remote.csb (177.204.230.17.dynamic.adsl.gvt.net.br. [177.204.230.17]) by smtp.gmail.com with ESMTPSA id k54sm9373533qtf.28.2019.10.12.17.23.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Oct 2019 17:23:12 -0700 (PDT) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Sat, 12 Oct 2019 21:22:31 -0300 Message-Id: <20191013002232.1045-9-unixmania@gmail.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20191013002232.1045-1-unixmania@gmail.com> References: <20191013002232.1045-1-unixmania@gmail.com> Subject: [Buildroot] [PATCH 8/9] configs/roseapplepi: drop custom post-image script X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Carlos Santos , Peter Korsgaard , Peter Seiderer , Fabio Estevam , Martin Bark MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Carlos Santos Use support/scripts/genimage.sh, instead, which prevents duplicating TARGET_DIR under ${BUILD_DIR}/genimage.tmp/root. Signed-off-by: Carlos Santos --- The defconfig was edited by hand to reduce the turmoild that would result from using "make savedefconfig" --- board/roseapplepi/post-build.sh | 4 ++++ board/roseapplepi/post-image.sh | 18 ------------------ configs/roseapplepi_defconfig | 4 +++- 3 files changed, 7 insertions(+), 19 deletions(-) create mode 100755 board/roseapplepi/post-build.sh delete mode 100755 board/roseapplepi/post-image.sh diff --git a/board/roseapplepi/post-build.sh b/board/roseapplepi/post-build.sh new file mode 100755 index 0000000000..ffdd19138c --- /dev/null +++ b/board/roseapplepi/post-build.sh @@ -0,0 +1,4 @@ +#!/bin/sh +BOARD_DIR="$(dirname $0)" + +cp $BOARD_DIR/uEnv.txt $BINARIES_DIR/uEnv.txt diff --git a/board/roseapplepi/post-image.sh b/board/roseapplepi/post-image.sh deleted file mode 100755 index e8f2df23f3..0000000000 --- a/board/roseapplepi/post-image.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -cp "${BOARD_DIR}/uEnv.txt" "${BINARIES_DIR}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" - -exit $? diff --git a/configs/roseapplepi_defconfig b/configs/roseapplepi_defconfig index 966d444a45..d315a02e16 100644 --- a/configs/roseapplepi_defconfig +++ b/configs/roseapplepi_defconfig @@ -8,7 +8,9 @@ BR2_GLOBAL_PATCH_DIR="board/roseapplepi/patches" BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y # kernel does not build with gcc 8.x BR2_GCC_VERSION_7_X=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/roseapplepi/post-image.sh" +BR2_ROOTFS_POST_BUILD_SCRIPT="board/roseapplepi/post-build.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/roseapplepi/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y From patchwork Sun Oct 13 00:22:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1175784 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SXlUOqIA"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46rMqM5Tq8z9s7T for ; Sun, 13 Oct 2019 11:23:27 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4B75085FA0; Sun, 13 Oct 2019 00:23:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vpDuu4z0l7Dh; Sun, 13 Oct 2019 00:23:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 94E6A85FA3; Sun, 13 Oct 2019 00:23:25 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 174EB1BF969 for ; Sun, 13 Oct 2019 00:23:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0E1D387034 for ; Sun, 13 Oct 2019 00:23:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pgEiFifCu-Ha for ; Sun, 13 Oct 2019 00:23:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by whitealder.osuosl.org (Postfix) with ESMTPS id 5F279874F7 for ; Sun, 13 Oct 2019 00:23:17 +0000 (UTC) Received: by mail-qt1-f194.google.com with SMTP id o12so19696741qtf.3 for ; Sat, 12 Oct 2019 17:23:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=izw74qBoufNQMioVzKPfJG8qNWqicuK66UUpPIXIITw=; b=SXlUOqIApVih+o1DFFHM6QLj1G6d2gz1RX23S5idKAOk/sAeJQPWI6s1WjUWj2mTwW aJ35zNpjcOT8KUlMFFnNYA5zEG/PuvN+pWNoZBnY4zz/Syz+Tm37E+4dkm+aSVuUzToe cuEkE6UvxIMxrbDxyqPv0c8Wzw+hOgD1hh5iWfR3eD6JmzcaMtXayeFWThWZ42rIk3PI yabtc4BR67aJj7oXdK2B1SFbH/XPnbrgRenPBIR+59teLlvr3J7vSO+hLmA5E2KHs9xa 47tO9/yaQVVRszXzFqcaXzjdxIbb3LEUsniFnd/uvmMR0YcQZkZ9lsa9nGaB5MMp5sfE dEig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=izw74qBoufNQMioVzKPfJG8qNWqicuK66UUpPIXIITw=; b=pPf+zZ4uwuZZDHVj62vQOiGYeFHqC05WV2ld8+HE8zitImga2CVnafJjvjNdeei95O v6IpLrGVuf+hJ2mCd4g1i3EIYH7nychVNBkffnjOTZs4sdkQfzONl3a4ggdUK5FrCK66 r4Um3sLbLSCO8fnAlmPPAk5aCw2B+GNo7hlEY1bpqi3w2/A+9gJAZs1UutJ4eJHgTllh ZkE0Ag2fBTzP12TzHKQdH9cNRIuT3FLqKi34dtmFSiWbA0TwaBZoO/oW9rP9lVeW7899 XhOi6/LbSZ0e5yyIOs6mclPf89hF3AflwJSlRm4um+nvP6eDYUhevbgiT1gaTfAzrivR xWMQ== X-Gm-Message-State: APjAAAWdPvzWwJ4X5XBLXWq68eQ0+d2UMwLNznmenr+i3Ap7u6AZkm4u qw1ZJ91GT4GTYCfkSL4O9sblOPrPoIs= X-Google-Smtp-Source: APXvYqxdDoorLRRq+AlLjXcV5tSATxp99swn05+dQe3mcMXJ/2yQe0OOOaze/M5JQB9jdPmhXgZiBg== X-Received: by 2002:aed:3f3a:: with SMTP id p55mr25194388qtf.194.1570926196311; Sat, 12 Oct 2019 17:23:16 -0700 (PDT) Received: from casantos.remote.csb (177.204.230.17.dynamic.adsl.gvt.net.br. [177.204.230.17]) by smtp.gmail.com with ESMTPSA id k54sm9373533qtf.28.2019.10.12.17.23.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Oct 2019 17:23:15 -0700 (PDT) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Sat, 12 Oct 2019 21:22:32 -0300 Message-Id: <20191013002232.1045-10-unixmania@gmail.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20191013002232.1045-1-unixmania@gmail.com> References: <20191013002232.1045-1-unixmania@gmail.com> Subject: [Buildroot] [PATCH 9/9] configs/wandboard: drop custom post-image script X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Carlos Santos , Peter Korsgaard , Peter Seiderer , Fabio Estevam , Martin Bark MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Carlos Santos Use support/scripts/genimage.sh, instead, which prevents duplicating TARGET_DIR under ${BUILD_DIR}/genimage.tmp/root. Signed-off-by: Carlos Santos --- The defconfig was edited by hand to reduce the turmoild that would result from using "make savedefconfig" --- board/wandboard/post-image.sh | 15 --------------- configs/wandboard_defconfig | 3 ++- 2 files changed, 2 insertions(+), 16 deletions(-) delete mode 100755 board/wandboard/post-image.sh diff --git a/board/wandboard/post-image.sh b/board/wandboard/post-image.sh deleted file mode 100755 index 18e76aa40d..0000000000 --- a/board/wandboard/post-image.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bash - -BOARD_DIR="$(dirname $0)" -GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" - -rm -rf "${GENIMAGE_TMP}" - -genimage \ - --rootpath "${TARGET_DIR}" \ - --tmppath "${GENIMAGE_TMP}" \ - --inputpath "${BINARIES_DIR}" \ - --outputpath "${BINARIES_DIR}" \ - --config "${GENIMAGE_CFG}" - diff --git a/configs/wandboard_defconfig b/configs/wandboard_defconfig index d2f72f734f..c3e04af53e 100644 --- a/configs/wandboard_defconfig +++ b/configs/wandboard_defconfig @@ -7,7 +7,8 @@ BR2_ARM_FPU_VFPV3=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0" BR2_ROOTFS_POST_BUILD_SCRIPT="board/wandboard/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/wandboard/post-image.sh" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/wandboard/genimage.cfg" BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y