From patchwork Fri Nov 15 12:50:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1195627 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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="TBmmk+0W"; 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 47Dyry3H8Xz9sPK for ; Fri, 15 Nov 2019 23:51:14 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 99EF488A48; Fri, 15 Nov 2019 12:51:12 +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 1w0gQCuYI5ya; Fri, 15 Nov 2019 12:51:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 7D39A88B11; Fri, 15 Nov 2019 12:51:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 840301BF9B0 for ; Fri, 15 Nov 2019 12:51:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 80B6E871D7 for ; Fri, 15 Nov 2019 12:51:05 +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 Lh4QM_a6kSxp for ; Fri, 15 Nov 2019 12:51:04 +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 fraxinus.osuosl.org (Postfix) with ESMTPS id 4D6E187722 for ; Fri, 15 Nov 2019 12:50:17 +0000 (UTC) Received: by mail-qk1-f195.google.com with SMTP id h15so7934773qka.13 for ; Fri, 15 Nov 2019 04:50:17 -0800 (PST) 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=UzTRk5lPPfc/wAi0cSb+uks946mQPgRoLIrV4rX0ABY=; b=TBmmk+0WyiJtyL7AiF7jMCw3dwa8sgx//CFO7woUhE0p1DB4vaDn4tsoxk7e9VwROH D+kUwkdFsiBnnz3vJufcxMHYdLLbGrJCrSXrpSoqW2vliwQ+VU9vW2y7zlUBTHKI4sm7 fOGZ0rTGZV/LM6wp01ZYdpgB2BjMjEy6y7a3uO+gZsiwp0svjEi7D9LVyeD91/beXjNo vu/0KkbDE7vY7fUn3hAZHN/jsNeinDEdblcV1fWRGsZnpbNabwzzkZyBKhnzGVH750t+ qWLv68SSAF4q6xvIqyNxl1arsqdDmhamYpIUSnFm1oiPvljay4X63vEEDc0eOYaOpG91 oe5A== 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=UzTRk5lPPfc/wAi0cSb+uks946mQPgRoLIrV4rX0ABY=; b=H5uoXHED1HLyeWRM989rlo0OTW0KREznMZafpNjxfHn0tYb2+p9/FAULSfK9+Uy8TE N8jaWAkK3n3kWM8GHdo39Qa9MX3dGtz1EuEs7NMGlurRIOqGSBgQA1bJTPdaBzgPr1Ln WN5EKvD+LYuLPqf88I2ixvom2JzZhzLwPkYo+jfAJ4wb/r7xfAFPKCBrsrSdGiMuya4O b2Edlf1sKVJFraZluKvGAr6Z3GhzxuuGZo7dQSpD6vK/sRmteoQeOjn+cy4y2uFP7jIo 9IYcizOAFnfmJgNp5Ch1DUNQfflMcjA+xpsA/9CQ9pzitK60+Vdts4+goCEXn2xBiain WRew== X-Gm-Message-State: APjAAAU00gafRdOJdsbLclQVCtiQhq0nFlcAZZk2ZLFAyXwXzEFwZ5+q nCm4z1/x3QmM5B33CDoS9Z5K3uKs X-Google-Smtp-Source: APXvYqxM0VQQKmOTNsAHMwzpmL9fIYHqmJk8JCheux39/IK186iy1hcf7tkduFElXzfDGaZgBgiLTQ== X-Received: by 2002:a37:a70b:: with SMTP id q11mr12596307qke.350.1573822216034; Fri, 15 Nov 2019 04:50:16 -0800 (PST) Received: from casantos.casantos.org ([177.18.138.136]) by smtp.gmail.com with ESMTPSA id y27sm5086528qtj.49.2019.11.15.04.50.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Nov 2019 04:50:15 -0800 (PST) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Fri, 15 Nov 2019 09:50:01 -0300 Message-Id: <20191115125001.28255-6-unixmania@gmail.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20191115125001.28255-1-unixmania@gmail.com> References: <20191115125001.28255-1-unixmania@gmail.com> Subject: [Buildroot] [PATCH/next v3 5/5] configs/beaglebone_qt5: 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 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 beaglebone. Drop the post-image script. Signed-off-by: Carlos Santos --- board/beaglebone/post-image.sh | 29 ----------------------------- configs/beaglebone_qt5_defconfig | 4 +++- 2 files changed, 3 insertions(+), 30 deletions(-) delete mode 100755 board/beaglebone/post-image.sh diff --git a/board/beaglebone/post-image.sh b/board/beaglebone/post-image.sh deleted file mode 100755 index 68fe0896c6..0000000000 --- a/board/beaglebone/post-image.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# post-image.sh for CircuitCo BeagleBone and TI am335x-evm -# 2014, Marcin Jabrzyk -# 2016, Lothar Felten - -BOARD_DIR="$(dirname $0)" - -# copy the uEnv.txt to the output/images directory -cp board/beaglebone/uEnv.txt $BINARIES_DIR/uEnv.txt - -# the 4.1 kernel does not provide a dtb for beaglebone green, so we -# use a different genimage config if am335x-bonegreen.dtb is not -# built: -if [ -e ${BINARIES_DIR}/am335x-bonegreen.dtb ] ; then - GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg" -else - GENIMAGE_CFG="${BOARD_DIR}/genimage_linux41.cfg" -fi - -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/beaglebone_qt5_defconfig b/configs/beaglebone_qt5_defconfig index 4a558c9ad4..99355e855c 100644 --- a/configs/beaglebone_qt5_defconfig +++ b/configs/beaglebone_qt5_defconfig @@ -5,7 +5,9 @@ BR2_TOOLCHAIN_BUILDROOT_GLIBC=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y BR2_TOOLCHAIN_BUILDROOT_CXX=y BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=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_TARBALL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,beagleboard,linux,4.19.79-ti-r30)/linux-4.19.79-ti-r30.tar.gz"