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