From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 09 Dec 2021 06:23:04 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mvBtY-000hxa-7o for lore@lore.pengutronix.de; Thu, 09 Dec 2021 06:23:04 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1mvBtX-0005Sf-Ka; Thu, 09 Dec 2021 06:23:03 +0100 Received: from mail-vi1eur05on2043.outbound.protection.outlook.com ([40.107.21.43] helo=EUR05-VI1-obe.outbound.protection.outlook.com) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mvBsw-0005SB-JF; Thu, 09 Dec 2021 06:22:27 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L/rg8849XOVmIXMLXtoN6PZc3udSYbRv04TgqbebwUqMMjMG32u+FuXNWVxDKNINf6odp5Q/bOjiC0zmhLZzmDoSFBpZcwVy28OTMK2tS1iaCD/7gzKhhFHGdyiFaytUzG/iVZtmu2NSm8gAdHbQunfHqtiMQImEsGdtcv6tl99edYV1iHn84RSdrKRI4HcnSlo/nXN1Abo89MiXvGufhygcDrm5jtuU3RQC1d44SHmDwv3ExmD0JYG/uzQ/Uub+xcWfVMGfJGqcQei/pJhLld96lJdcuKx24zMBjtvYT6FHiRBiVsaStIsNtE0Q/FioKF2fERBOAbWvZKQXs4MJAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=r3znHlicNmaRqyKrVHwDJF2yT93QPhEkXXah6Vwhp1I=; b=AZW7vFSdi7kb+p5BWwDKiTPKf8N8KuvKXApnZ/Yo16sWRJwaZkRVL0GEYlB5z8jzCzXuOuqp3pGWdUVTOpMwu+OnqXyW475qo/+w4tnFx29zBfiEw+wbv0K2tHcmIBFA9NUwnFFDcyQI+apkRIq4FKbIEMOGJJWYDAfwa9rSz59oah1UuLpUshzPz8eYOZpgHW23qE4SfDh4mhtt7i3hN/S7S7nm0f0+RswU7Yic9cHJbUNr4Fbgl6OwfQjqKGFqOoSOC62o5/RI4ao64SkRSoe9sY3zJ5FQyhWvltlDaLd6DwYveUweqyQ0nGw+O8rYBzk2IQRvUfK2qdDBfORrYQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wolfvision.net; dmarc=pass action=none header.from=wolfvision.net; dkim=pass header.d=wolfvision.net; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wolfvision.net; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=r3znHlicNmaRqyKrVHwDJF2yT93QPhEkXXah6Vwhp1I=; b=PW1ABGIEcL8zCwWxjheNY+rafbTGsmqqQSfHZfEKF8bJ9uMLOvxBVhCbFHOJxHftw0lXPr1HEIAt+25AnqfTYgTubuHpEKBX7S60/NWpR5ZanrOkzgOhHH0PNUDxITeMrLTTO/7vPmrvirY+8ZzzKS5t+osZXhkCf2EJ+pQYTkE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=wolfvision.net; Received: from DBBPR08MB4523.eurprd08.prod.outlook.com (2603:10a6:10:c8::19) by DB6PR08MB2630.eurprd08.prod.outlook.com (2603:10a6:6:24::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.20; Thu, 9 Dec 2021 05:22:21 +0000 Received: from DBBPR08MB4523.eurprd08.prod.outlook.com ([fe80::81d1:d448:4016:1956]) by DBBPR08MB4523.eurprd08.prod.outlook.com ([fe80::81d1:d448:4016:1956%4]) with mapi id 15.20.4755.022; Thu, 9 Dec 2021 05:22:21 +0000 To: ptxdist@pengutronix.de, m.olbrich@pengutronix.de References: <20211206075431.1238025-1-michael.riesch@wolfvision.net> <20211206075431.1238025-4-michael.riesch@wolfvision.net> <20211208075950.GE15196@pengutronix.de> From: Michael Riesch Message-ID: Date: Thu, 9 Dec 2021 06:22:20 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.14.0 In-Reply-To: <20211208075950.GE15196@pengutronix.de> Content-Language: en-US X-ClientProxiedBy: ZR0P278CA0038.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::7) To DBBPR08MB4523.eurprd08.prod.outlook.com (2603:10a6:10:c8::19) MIME-Version: 1.0 Received: from [IPv6:2a05:1141:1c9:7c00:2971:328c:3026:3149] (2a05:1141:1c9:7c00:2971:328c:3026:3149) by ZR0P278CA0038.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16 via Frontend Transport; Thu, 9 Dec 2021 05:22:21 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 99089e1c-9063-4a89-cd47-08d9bad3e086 X-MS-TrafficTypeDiagnostic: DB6PR08MB2630:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1169; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SG4NeW4AEy08grydcjefTAkInbh8wh2uFVoxCO2+z/aR9nlmbK3nPfA0HkgYwDVRmuErkXxkxZWc2gHFw39qpbK0jlnVDIyTuGxoozqD481UaSCivzuw2/jfQZEF2EwhuS6DV6vVgmJZrxoq1pV78/fks+J7Rp5Ouf0xmonfOrwww4vfcLzH/ILbaXTPaXzQ2fSPVqh7BWNCPnjaFgdicPFjfjpWlukyg0zzgIXKGfAMzUrFWxvABaBLYKL6iTHDYYtFX2Qqa5BU/hgPPtzz0caYwe57u+eZIJJMHHv4F2Q+mgFp/HRwM2BgyjLjAdw+XhmfvQjBNDEWZ2oz3c4Tlv7Mk3nGsdGNXZgsFGXoTG0whoKwjPv6EPTxuTjxP0PDLojoxwuHd9EWkZqAbCpzbXx2x8dQhnWc8/selLRCEg2Ifxruw0bamzslsL9dxZMm3rxDN8/w24ZgZDTY6DnpP5nVHLODtEREGzpIl56NcsjoLyum47DaxtHEoQrqHwNonHvPLysyoJoLRlH/duYRED18PtrINZlGBrkMNx5CZGFXTBKhYkvbv43XZDNobGH5YlidzaBUb11kbKtAPSNB2X2qMxz8BpE1XLGOz5PYb9x5kuOG2Yf8mGdyB5ovrEbn5IDfrR4hxMyxJupgCUd1mKII9zrd7FCBVgvoK5HQ/XYEL5j/GjRBAvVDY1AbMSNP7SQQGHs8Jlnuc54ZomblWbbrKbKZv+UYPtoKMFmiyxw= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBPR08MB4523.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(186003)(44832011)(6486002)(5660300002)(38100700002)(66556008)(66476007)(508600001)(316002)(31696002)(66946007)(31686004)(86362001)(52116002)(83380400001)(2906002)(2616005)(450100002)(36756003)(4326008)(53546011)(8676002)(8936002)(43740500002)(45980500001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Qld5cXYzOFN3SGNGUFZDeVR6MWg4ajVmVmhkcGJtRUk2Nzd5ZHhGcy9aVXps?= =?utf-8?B?MzFnVWY1Y2ZqTHA0U2tTOWJ0MVNnZEFOc3JoZmJKa3MvMHJBTjFqK3M0ZXoy?= =?utf-8?B?VVU0aUFnRUNNT3BtaFVBZmtPS0lXZ2tPK0xTaTlpbGgvNUpwUGQydm5BUzdW?= =?utf-8?B?bTFIZ3FwQ1VOamVIWElCOGdxRzFNODRpenFjMjZXQzMyakxIOEl3bE5qY3Fz?= =?utf-8?B?SXNja1ovSjMrVW1FWjUxTXBBOWtqWVNTOG0wdm5VODNnUTN2bU1rNkFzeDNa?= =?utf-8?B?a3IwVkFNRjJVTk9ZSm9mMU56QVVXenp6MTQrM2RWWkpEUnJibHJiUjI2U2V0?= =?utf-8?B?MXA4cUVBclNNN05URk5WTGMybHJuVzZFVmJtNVowSy8xQXhDWUZtVWUxZWRT?= =?utf-8?B?ekgvcFRVZDEzdW9PQWprS1pvWEdKbVFkNTNPVy95eHl1K050VlVWb0ZDdHpa?= =?utf-8?B?Y3U0emM0bGtUTHU0a2xrQWtoamZ4cFN2VkZuM0FaNzJQSlpDM0tVLzdEd2VG?= =?utf-8?B?dzJmbUpWbi91RzhOZlQyVFZnSGFJdUNqVlN2UjRleFdKUzg4czgrUjBxajc4?= =?utf-8?B?cTZSZGtPRzZyMC9UUGhEMmlCMzQraFFJeW84WEFITU9sRXo3Zlp0QlVtelpj?= =?utf-8?B?b0NWMGhhOUlmVlZuYXk1R3hYNEVHS0ptZUkrN3N0eWQ4cnJGanBWWFF3UnhZ?= =?utf-8?B?bzdoTnlRdVExRVJQU1BESEhvcTkzTXJFeUQ3N2tqOTUwTW51Zk5uN2l0NFpK?= =?utf-8?B?TnNqZmsrUTFXU0tqaVgxTFBmVlZzR0hCb2V6VXNtZXdTOVhKTnRCR1JmMkt5?= =?utf-8?B?TWJZd2FRazgvUjBtM0VDSlUvUU9RMWZrMEM4Rmc3TXVFK25pZE50Y0hiWkZ1?= =?utf-8?B?MWIzNys2Yi9wb3VmQnJGOTVxc3BuSWNQU1l2NTArS0hkeGpNVWM2VE1FdXNs?= =?utf-8?B?MDl6VDJRUmRsY2M4VGtMZzBsWVZxclQ2ZEtYTXlzakxQZjdkMmRwVmxZSEdW?= =?utf-8?B?T3lyNFU2WW1sMEsrTmlrbENZeU8wd3ViZHA4U0Y1cXJNZWtrOVd3UDU2ZitR?= =?utf-8?B?VCt6TmZIYnZ2UUpHZkxwZnQ5alRXcEI3cWxoaGpKMGtMeHFoS0lJRTlvVEFP?= =?utf-8?B?RXJxeForWkdrbGpOdGw4WWdIWTlYV093amplZkNvN05XU29UbzNEajN5Umcw?= =?utf-8?B?OGFlVWdsQWNXOURCcm53c0RudExYckxTbkRXcURvN0JtR3VabnBDd0YxUzVu?= =?utf-8?B?dW9TQ0lwM2lRc05rUlR5WkhTYTB5R3habGMxcHl2enZhVzdxNUZiT3pxMC9S?= =?utf-8?B?K0tJSWxUbFJOZDhRM2p2cThBaWs3VjM2aEhwMHRLbWE2WEpxN2FGclZSamVn?= =?utf-8?B?VjhqVFBLOC8xYnptZmRtYVZyMUtlR0x5TDBRZEd6OE9Ra3A4eE8zdEd6dkJL?= =?utf-8?B?akNKVk93a00wZnNjWnJFYTBzdjdsSU9MVFRaYVBneENyaE1zSFJjYlFxMUhj?= =?utf-8?B?ZEMwWTZObk1UbkdnRDBJYmo3SlZEMlhnQTVHcFJLQVJJL254WmNiYzhTQW9k?= =?utf-8?B?VlVqZDFaQmxtaGRpdm1UWVRSanl1aTd2Y3R5YW80RStTTVdNZWUydC8yZ2FV?= =?utf-8?B?RmcxWlp4ZDdiK3NPM2tRbi9oQnBPM05VM2JZY053bEZDeUJZNSt2dU9yUUNi?= =?utf-8?B?MGFYNEVvS2JUOW0xMnRVQlFmdEZVZmo2Y2xPMnBlVHNiYzFsZy9MVko0eU94?= =?utf-8?B?eUNUSXU5S2sxNFNOM3VRb1pGamxBcUxBMklsSGo1b1hxK3QyRjRhb1JsTlAz?= =?utf-8?B?M0llTXFteFlXUWN3SzB1OWgxNUUzdUp1aWU2dGVVUWl3UXFWU2V6QmUxUmIy?= =?utf-8?B?WDRjc1lMRThxdm9udlAwSkFmNUdFVXlJT0hDVi9Fb2xScmRMT0RUUkh0NEsw?= =?utf-8?B?UzJ4SzJIdlZNYmE5bU5LdFRLaE9KdVlLaEZDYUdGNGJKUC9IbWFFL282QTA0?= =?utf-8?B?eE9MTDBYV1lVTFRDS2FITkhYOVRnLzFNemxNUGhqV0I0Y0RzN2E4SndIejdI?= =?utf-8?B?SWdwYytLZlhLaXJlOGNKWDB5dDB0eVZBS1dGdS8vOHJZSTBvRHZoVTl5Zktv?= =?utf-8?B?QU03NUU4NTgyNXNzMUFLemdKOFpnbnlVVHRFVStQUk1YMk53eTBwWTRlZmxU?= =?utf-8?B?RzRJZ3VRVXZ0SUIrYmViTFJSZ2NLQk9HWTFXbzM0eEQ4NzNCTnk4d1RVckJY?= =?utf-8?B?MnR6U25YVjhySGN2M2F2UVVzRTZHamdidDRMYzVyTDZ2c2RCU21Qd1FueGhD?= =?utf-8?B?WXBUd01Ia2lmMkNiUGpzZjczM0xiTlpTZEE2ZHdDRFdIa1FRN3dLZz09?= X-OriginatorOrg: wolfvision.net X-MS-Exchange-CrossTenant-Network-Message-Id: 99089e1c-9063-4a89-cd47-08d9bad3e086 X-MS-Exchange-CrossTenant-AuthSource: DBBPR08MB4523.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Dec 2021 05:22:21.8841 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: e94ec9da-9183-471e-83b3-51baa8eb804f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Y4b0Wbup4xNT/dZqm5MZBz8/5I7zFxwdGAvvB/ADkIGZ39V9I5o+fxg2rmxeGixU9dtnMQfyjKwoqYJ+TGp4tAUT+8GBsOUlZlAM/3gbVSU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR08MB2630 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.4 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MSGID_FROM_MTA_HEADER, NICE_REPLY_A,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Subject: Re: [ptxdist] [PATCH v2 3/3] barebox: add integration of firmware blobs X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: m.tretter@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Hello Michael, On 12/8/21 8:59 AM, Michael Olbrich wrote: > On Mon, Dec 06, 2021 at 08:54:31AM +0100, Michael Riesch wrote: >> In some cases barebox requires firmware blobs, which may be >> provided in binary form by the vendor or compiled in a >> preceding step. Add the possibility to specify files which >> are injected in the barebox source directory during >> preparation. >> >> Signed-off-by: Michael Riesch >> --- >> platforms/barebox.in | 31 +++++++++++++++++++ >> rules/barebox.make | 6 ++++ >> rules/post/ptxd_make_world_inject.make | 19 ++++++++++++ >> scripts/lib/ptxd_make_world_inject.sh | 43 ++++++++++++++++++++++++++ >> 4 files changed, 99 insertions(+) >> create mode 100644 rules/post/ptxd_make_world_inject.make >> create mode 100644 scripts/lib/ptxd_make_world_inject.sh >> >> diff --git a/platforms/barebox.in b/platforms/barebox.in >> index d35d16501..150fcc77b 100644 >> --- a/platforms/barebox.in >> +++ b/platforms/barebox.in >> @@ -15,6 +15,7 @@ menuconfig BAREBOX >> select HOST_IMX_CST if BAREBOX_NEEDS_HOST_IMX_CST >> select HOST_LZOP if BAREBOX_NEEDS_HOST_LZOP >> select CODE_SIGNING if BAREBOX_NEEDS_KEYS >> + select FIRMWARE_ROCKCHIP if BAREBOX_NEEDS_FIRMWARE_ROCKCHIP >> prompt "barebox " >> bool >> help >> @@ -55,6 +56,29 @@ config BAREBOX_CONFIG >> This entry specifies the .config file used to compile >> barebox. >> >> +menuconfig BAREBOX_FIRMWARE >> + bool >> + prompt "integrate firmware blobs " >> + >> +if BAREBOX_FIRMWARE >> + >> +config BAREBOX_FIRMWARE_PATH >> + string "path(s) to firmware blobs" >> + default "${PTXDIST_SYSROOT_TARGET}/usr/lib/firmware" >> + help >> + Define path to the firmware blob(s). Multiple directories can >> + be specified separated by ':'. > > It works the same way as KERNEL_DTS_PATH, so just copy the rest of the > description. > >> + >> +config BAREBOX_FIRMWARE_FILES >> + string "firmware blob file(s)" >> + default ".bin" >> + help >> + Select the firmware blob to be integrated into the barebox >> + source before compilation. Multiple dts files can be >> + specified, separated by spaces. > > 'dts'? Copy paste error? > > From what I read below, each file can be : so that should > be documented here. > >> + >> +endif >> + >> config BAREBOX_EXTRA_ENV >> prompt "extend the builtin barebox environment" >> bool >> @@ -146,4 +170,11 @@ config BAREBOX_NEEDS_HOST_LZOP >> lzop is used in order to compile lzop for your development >> host. >> >> +config BAREBOX_NEEDS_FIRMWARE_ROCKCHIP >> + prompt "barebox needs firmware-rockchip" >> + bool >> + help >> + Select this if barebox needs the non-free Rockchip firmware >> + blobs. > > This should depend on ARCH_ARM64, or something like that. > >> + >> endif >> diff --git a/rules/barebox.make b/rules/barebox.make >> index bea9f3adc..a81fc86b3 100644 >> --- a/rules/barebox.make >> +++ b/rules/barebox.make >> @@ -26,6 +26,8 @@ BAREBOX_BUILD_DIR := $(BAREBOX_DIR)-build >> BAREBOX_LICENSE := GPL-2.0-only >> BAREBOX_DEVPKG := NO >> BAREBOX_BUILD_OOT := KEEP >> +BAREBOX_INJECT_PATH :=$(call remove_quotes,$(PTXCONF_BAREBOX_FIRMWARE_PATH)) >> +BAREBOX_INJECT_FILES :=$(call remove_quotes,$(PTXCONF_BAREBOX_FIRMWARE_FILES)) >> >> BAREBOX_CONFIG := $(call ptx/in-platformconfigdir, \ >> $(call remove_quotes, $(PTXCONF_BAREBOX_CONFIG))) >> @@ -94,6 +96,10 @@ ifdef PTXCONF_BAREBOX_EXTRA_ENV >> @rm -rf $(BAREBOX_BUILD_DIR)/defaultenv/barebox_default_env >> endif >> >> +ifdef PTXCONF_BAREBOX_FIRMWARE >> + @$(call world/inject, BAREBOX) >> +endif >> + >> @$(call touch) >> >> # ---------------------------------------------------------------------------- >> diff --git a/rules/post/ptxd_make_world_inject.make b/rules/post/ptxd_make_world_inject.make >> new file mode 100644 >> index 000000000..b7d28e92f >> --- /dev/null >> +++ b/rules/post/ptxd_make_world_inject.make >> @@ -0,0 +1,19 @@ >> +# -*-makefile-*- >> +# >> +# Copyright (C) 2021 by Michael Riesch >> +# >> +# For further information about the PTXdist project and license conditions >> +# see the README file. >> +# >> + >> +world/inject/env = \ >> + $(call world/env, $(1)) \ >> + pkg_inject_path="$($(1)_INJECT_PATH)" \ >> + pkg_inject_files="$($(1)_INJECT_FILES)" \ >> + pkg_source="$($(1)_DIR)" >> + >> +world/inject = \ >> + $(call world/inject/env,$(strip $(1))) \ >> + ptxd_make_world_inject >> + >> +# vim: syntax=make >> diff --git a/scripts/lib/ptxd_make_world_inject.sh b/scripts/lib/ptxd_make_world_inject.sh >> new file mode 100644 >> index 000000000..bc06b9503 >> --- /dev/null >> +++ b/scripts/lib/ptxd_make_world_inject.sh >> @@ -0,0 +1,43 @@ >> +#!/bin/bash >> +# >> +# Copyright (C) 2021 by Michael Riesch >> +# >> +# For further information about the PTXdist project and license conditions >> +# see the README file. >> +# >> + >> +ptxd_make_inject() { >> + local source target >> + >> + source=$(echo $inject_file | cut -d ":" -f 1) >> + target=$pkg_source/$(echo $inject_file | cut -d ":" -f 2) >> + if [ -z $target ]; then >> + target=$source >> + fi > > Use ${} for all variables and don't forget the quotes. > >> + >> + if [[ "${source}" =~ ^/.* ]]; then >> + ptxd_bailout "'${source}' must not be an absolute path!" \ >> + "Use _INJECT_PATH to specify the search path." >> + fi >> + >> + if ! ptxd_in_path pkg_inject_path "${source}"; then >> + ptxd_bailout "Blob '${source}' not found in '${pkg_inject_path}'." >> + fi >> + source="${ptxd_reply}" >> + >> + echo -e "\nInject file $source into $target..." > > same here. > > Use ptxd_print_path to shorten the output. > >> + cp $source $target > > Michael Thanks for your review. v3 coming up! Best regards, Michael > >> +} >> +export -f ptxd_make_inject >> + >> + >> +ptxd_make_world_inject() { >> + ptxd_make_world_init || break >> + >> + for inject_file in ${pkg_inject_files}; do >> + ptxd_make_inject || break >> + done >> +} >> +export -f ptxd_make_world_inject >> -- >> 2.30.2 >> >> >> _______________________________________________ >> ptxdist mailing list >> ptxdist@pengutronix.de >> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de >> > _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de