From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6989231260094693376 X-Received: by 2002:a19:c1d0:: with SMTP id r199mr12861473lff.340.1627307217752; Mon, 26 Jul 2021 06:46:57 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a7c4:: with SMTP id x4ls2698623ljp.8.gmail; Mon, 26 Jul 2021 06:46:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzWSCH9yt+wct1fuWr6a/CRU5wYofvHU/JYzwRvLePhLmLRZZCGym3glSZM0R/lfv/zXmzr X-Received: by 2002:a2e:9304:: with SMTP id e4mr12259923ljh.244.1627307216523; Mon, 26 Jul 2021 06:46:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627307216; cv=none; d=google.com; s=arc-20160816; b=l1ilaefXpCiRdzZGDqx0ZXho3K6XsTwR2kbTKrkyqaFl2Bp3D10sFCvxQiNISPtKVL O4K9STVI0oIX2V2OuJhHx3vQ5F8P/FcmD23yb7NAWzWvfo9pW9SbDiq2iPi9eKjr4WVS beGFxXc4CW7oFDg7EkWKB0BAAOSSQXSKTSi/6BsMZ8Vd1+EFaLiEBOxyX+hr4jaxH3Ki WI8maLh7OihVLCj8n1wzaFVmLFlUVx/uUviK0q/9sUkacpTO4T9uHlMYJjiE76BgMBB3 L50+xgGpNoqMOZmMAlJA2cXfXXplHwbnWi+sge1IyXW3fEOTevhVgqHjtt4BGWQwMaIv PVvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=Mu2aJ+bUtNWfcEQ3bL3mxOfy7/nKGRPg0enwUN5asuw=; b=rYf2L50IoS9EsXU0Az3jrhfYano36V/pUkbvOe8++8VpLfMi10qmLiLza0MFrHWJzA THPSkOTCBWYnW1/yBLEG1mktsvK8N0DpT1IgdVyOUTIIcnlbkELY5R0cIIf0I0IpmvCt qCwntAm7IqDn1iTJG+UXanY8RKh7QY46j67rDgtsgGLFR7/u/TXMOBn06kztotxC+0TY Xsn8F4iUVYOcpaTkhfdeg0oth8NKg5F2bfzgQ4gc6cRbr6SBF4nfIf/lp6EKW+id0oHW 9FL0/OZmF4dZ8hb6wek/4Xhg4Pjbg5qHnseGAjpgxpj8dMDPgbRvsjouYDy8e5itvv1g MbRQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id q4si981422lji.2.2021.07.26.06.46.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jul 2021 06:46:56 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from localhost.localdomain (mm-198-62-214-37.mgts.dynamic.pppoe.byfly.by [37.214.62.198] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 16QDknuv019679 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 26 Jul 2021 15:46:55 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [RFC 05/15] u-boot: Do not use shell environment Date: Mon, 26 Jul 2021 16:46:26 +0300 Message-Id: <20210726134636.30800-6-amikan@ilbers.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210726134636.30800-1-amikan@ilbers.de> References: <20210726134636.30800-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: R6+glL62cyKi To make package build process independent of the shell environment we should remove U_BOOT_CONFIG and U_BOOT_BIN passing through export call. So we migrate to template-based debian/rules file. Signed-off-by: Anton Mikanovich --- .../u-boot/files/debian/{rules => rules.tmpl} | 2 +- meta/recipes-bsp/u-boot/u-boot-custom.inc | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) rename meta/recipes-bsp/u-boot/files/debian/{rules => rules.tmpl} (93%) diff --git a/meta/recipes-bsp/u-boot/files/debian/rules b/meta/recipes-bsp/u-boot/files/debian/rules.tmpl similarity index 93% rename from meta/recipes-bsp/u-boot/files/debian/rules rename to meta/recipes-bsp/u-boot/files/debian/rules.tmpl index 85bda91..0507fc5 100755 --- a/meta/recipes-bsp/u-boot/files/debian/rules +++ b/meta/recipes-bsp/u-boot/files/debian/rules.tmpl @@ -13,7 +13,7 @@ SET_CROSS_BUILD_TOOLS=CROSS_BUILD_TOOLS=y endif override_dh_auto_build: - $(MAKE) $(PARALLEL_MAKE) $(U_BOOT_CONFIG) + $(MAKE) $(PARALLEL_MAKE) ${U_BOOT_CONFIG} $(MAKE) $(PARALLEL_MAKE) ${U_BOOT_BIN} ./scripts/get_default_envs.sh >u-boot-initial-env $(MAKE) $(PARALLEL_MAKE) $(SET_CROSS_BUILD_TOOLS) NO_SDL=1 tools-only envtools diff --git a/meta/recipes-bsp/u-boot/u-boot-custom.inc b/meta/recipes-bsp/u-boot/u-boot-custom.inc index 9984d8c..819206a 100644 --- a/meta/recipes-bsp/u-boot/u-boot-custom.inc +++ b/meta/recipes-bsp/u-boot/u-boot-custom.inc @@ -26,8 +26,8 @@ python() { DEBIAN_BUILD_DEPENDS ?= "bc, bison, flex, device-tree-compiler, git" -TEMPLATE_FILES = "debian/control.tmpl" -TEMPLATE_VARS += "MACHINE DEBIAN_BUILD_DEPENDS" +TEMPLATE_FILES = "debian/control.tmpl debian/rules.tmpl" +TEMPLATE_VARS += "MACHINE DEBIAN_BUILD_DEPENDS U_BOOT_CONFIG U_BOOT_BIN" U_BOOT_TOOLS_PACKAGE ?= "0" U_BOOT_CONFIG_PACKAGE ?= "0" @@ -70,9 +70,7 @@ u-boot-initial-env /etc fw_env.config /etc EOF fi -} -dpkg_runbuild_prepend() { - export U_BOOT_CONFIG="${U_BOOT_CONFIG}" - export U_BOOT_BIN="${U_BOOT_BIN}" + # restore execute permissions + chmod a+x ${S}/debian/rules } -- 2.25.1