From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7169469237672542208 X-Received: by 2002:a5d:6b08:0:b0:236:4b06:bbb1 with SMTP id v8-20020a5d6b08000000b002364b06bbb1mr19098552wrw.303.1669275101252; Wed, 23 Nov 2022 23:31:41 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:644f:0:b0:225:6559:3374 with SMTP id d15-20020a5d644f000000b0022565593374ls1510326wrw.2.-pod-prod-gmail; Wed, 23 Nov 2022 23:31:39 -0800 (PST) X-Google-Smtp-Source: AA0mqf709WFsgsGzDKAv36Q+1lYKtipI9J4uAIv8c9FX8mUM81k+ovrdLPpeis3FRmZo0cUal4Nd X-Received: by 2002:a5d:66c8:0:b0:241:eabf:3b90 with SMTP id k8-20020a5d66c8000000b00241eabf3b90mr4519368wrw.31.1669275099919; Wed, 23 Nov 2022 23:31:39 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1669275099; cv=pass; d=google.com; s=arc-20160816; b=iTSq0Yjytn4DbivaRpj9dMezRY80r7/Q3PRPZGgc/IBWK9yEw0O1r5UG1QQZYlxuJA zytL/afC45N7u8pjexjhL8239vKfsUO0srWWiCbmjrnC+ibSmH0ASoQhDFj5mMqP1Vv/ 7/6OaWpsKcM65/mEqeho3AtNDlz4d48T6qboo8CDnBf9h7FCnsJCFcfUtc4lt5b2S7Vf +wHyAwBG99HGBr8lfDMfZA2DdbSHPoXbqY9P4AwzFRLSOagfVEfxghyi3e4EDLZNsaCr 4hYtHDGIszvfy3YRSk5uEZezUTpf+4UaN+j037zG6N8uKSch6W+YBXUxElSGGy1bH9W7 Sf6Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:in-reply-to:from:references :to:content-language:subject:user-agent:date:message-id :dkim-signature; bh=KMffGz7IKkgetcbxvfEjhtA44jaIknO3pkh1oU9STV4=; b=BELi5Q+qI6m1gypwgbqDQfjZXBC4M2fZ3V/Ju+ZBOmKetSdVLbnn2fDFrK3P62wc9t WoesfJDS52kZe5Hy3LLEMpGnlwdp79JgLafFmg36DYHfqfTSzan7JnqSB7bM37ko1iOb AqAtVGIAADqoOvdMskMf01orBBGoCoGZGzM8nm0MZs0QJ4pyaI0qh4ZbhBYP3VPWkMdG uBRVV60ndFUy6gpzxRzXzW9Od7dgdYtlNmd7v1ijhx22ucLJFQDFrAjss1Rfvc0Jo/CA mERYQIT/We+ElHZnMSQCe4nWws1M5hJfAojwMlf28W5+jCcbt+Nc0r556sHLBGdNv22D 6a9Q== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=EtAeb47u; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 40.107.6.83 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60083.outbound.protection.outlook.com. [40.107.6.83]) by gmr-mx.google.com with ESMTPS id m65-20020a1ca344000000b003cfde9030c7si258815wme.0.2022.11.23.23.31.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Nov 2022 23:31:39 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 40.107.6.83 as permitted sender) client-ip=40.107.6.83; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=EtAeb47u; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 40.107.6.83 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MJ3o6bc/lJXrY1M90tmyJlpFiaVt10BNwlv8tWwlMkuYGtBmUqdshzVfOvw2TFjm9FyQJaIjmmhyCM/tPDVKRiHj1Z+7B2t81m5ZoNSWpihXAQRj6s1yD2M7YLJYKkWJh+7Kx60mak4oYcbcMl62Wzs5nV0HvtnIsTvr/a8Vc2gDkB7kJKlduBRXfloWp4VeHD4rarfYKf63rJJ2Z94YEg6WcJ8nsQA69b7CUfmijhAKKBSZ8UQbYdGiL9kPcabyg/9MTrOIjg7WwCD1LAFUn5AIdSAb37FqJKNZAFtwq967KSz9KB2Fnu/t6eN/aeKb6ZhJkrAQjJG7OwN5m5UeRA== 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=KMffGz7IKkgetcbxvfEjhtA44jaIknO3pkh1oU9STV4=; b=DQAH1VWfuOXmoQnvRTGDwNQYIJXqEF9tm13N77NDQQNCnTd9vSKWJl67UsWvgSxw/TEmvhv9F61+F9y6zFyR8+Od5HLoXJc9BDSLeOMucGh0O+hz4Tks3ICN+cwQvVAaIQjXPBWBXg7NS7aauvBIgVgNYftdwdCo6/wJXno1+0x+o0vcQB6PCJCNjwthkBp/8QLHbWVqM+Om/H0nv7gxY4bai90eqnSmg51JldGm7EPopc/5ZVtqsK9kgX/I3iawVkh43UgiwWbGvLMYXy8At0jCBjRDFdpAiDRxPI5Vbe8nXDmIKG6X8ATNTd0H2VTDQ2lloRNXVN5SBFnoqjHUcQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KMffGz7IKkgetcbxvfEjhtA44jaIknO3pkh1oU9STV4=; b=EtAeb47uNUg/+9vA+MJhnf6H6N4JVnTyJwMxjhTbnQPWF9N/Ud9PyyypJpF6jodMOTwS7To/+LhYDAw/86cjqvnZ+w/vkQG0/AHtdavQUTwdY+FuSelEShoapVD+YCj69soGqh78wqZjwTQ5RNCXnvzEvmXsT/RVxSYXi/l31cjHQ/oFpWUFIihC5mlrFxNaX6r6mEnN+D54A9Ozauow+23m1blCmAcSB1w0nd60Qd/hhqJb7n/gEZ1Z/KQmkbkmk6rQY1neyIXXyTHTQdxJEvJQKdwZpeubYUNQFsx6zp90Y/HLy1QPrfYUZmKWq1aHl/xfnVKa5eGs9rWNNt2hug== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) by AS2PR10MB6615.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:55e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5857.19; Thu, 24 Nov 2022 07:31:39 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::2957:50e8:8ce6:124a]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::2957:50e8:8ce6:124a%9]) with mapi id 15.20.5834.015; Thu, 24 Nov 2022 07:31:39 +0000 Message-ID: <7635a9b3-63e6-7e7a-04a1-3b905cbcf888@siemens.com> Date: Thu, 24 Nov 2022 08:31:34 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Subject: Re: [PATCH 1/2] Populate base-apt from both DISTRO and HOST_DISTRO download dirs Content-Language: en-US To: Uladzimir Bely , isar-users@googlegroups.com References: <20221124064213.22283-1-ubely@ilbers.de> <20221124064213.22283-2-ubely@ilbers.de> From: Jan Kiszka In-Reply-To: <20221124064213.22283-2-ubely@ilbers.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR0P281CA0045.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:48::14) To AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) Return-Path: jan.kiszka@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR10MB6181:EE_|AS2PR10MB6615:EE_ X-MS-Office365-Filtering-Correlation-Id: a849330f-9065-4540-8f64-08dacdedecca X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: njiVBlVU1mCNSpyWJ4jAzZFYrRlbfDQy1P8DPTif6J8syzF5QEm1jHXOYSWIrW035/1RHMa3iAZ2XeddUaeoXabet+gD8o8BTZ3TYhtNnyeUhrevu5DY840+QcYeAXqTlU8EutpdXI1+TQ9u2lOoXZFxgJnddwDtgn6oIsWlgxlIiw7r3kyFS17wvZV/xEqD3c2uYVBTlWjtGkMXXJ2acC1ecHBufsEVrQm2eXdYRRlvqfO48oljtX+dNLZG64/3i3R4ATEcCAemiUp2xvKd8969toT8Htht3HaenmT+ovoOZhi6MRu/w6sM68VpKSd0kDQHu8Hyxpynte0YKVGCp6qCRH7Yy8lVOzuYViwQhI6no8O7DCC174fCt9uYCE4LC06UJ5MT9FTkNHPwCNIDiung6Xf1+UZ7ITPafEvOyshVO6cdxzITMjWSbhwvoSXSXMz+cvVjwmHPadw6twfel9OOG9TAyNx1CGvrm0qNvuI34xR95t/AX+gn8Wf2fek/ZXM4SGX7XuDNQIcU6wWR2mOh7d1ZZTpsNvfEUuXc3gYuES+OqxUhTCbC5zs8l5FHWltNwg+CC4HyMUvSesn0kEdpCvmkkxKZsk8q7ZmxPPxYlkzVYnfx81D+KQyXBw5wIn8ocZ1TeT8C3HBL95UvdZEgSeWW3sjA4heij50hkK4zWG8fpXiF3eK0TV/Lcn4rt+BE6XZ26p+OMQuNAq99Q+VfewLiLZvrR1miJ03BsKA= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230022)(4636009)(346002)(366004)(136003)(39860400002)(376002)(396003)(451199015)(31686004)(83380400001)(2616005)(86362001)(31696002)(6506007)(478600001)(6486002)(36756003)(82960400001)(186003)(38100700002)(66946007)(66476007)(66556008)(5660300002)(26005)(6666004)(53546011)(44832011)(41300700001)(8936002)(8676002)(2906002)(316002)(6512007)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TE4zSCthSzFveElXVW9DckdUYkRMb0gycW0rQXU2UmhYajBGSUVTckZLL1Y4?= =?utf-8?B?Q1EwYmZGL0FqUHNwekNuR0NSbDE2TnV4UUZ5aHZCZm1UZDZKQlhCeDBkMDky?= =?utf-8?B?ejZqMGtSYjhqMXVsTFlXVG5takw1clhMZ3doSG9LWnFCT3Z3aE9jVHdtVVEw?= =?utf-8?B?d2FHcU54ZkVRS3lmczlxRlhPUDdNSDIvVGRnTzB3cmg3UzRhVjRkZnRPOEs3?= =?utf-8?B?QmticmJQcFFQZHM0TDBMaExuc0VqODJHZEd3dnZHUXNuZVNvL1NXWFZoQm5I?= =?utf-8?B?TUU5OW1uYkVUT2huQ0E5ZVRNdlFaMDIwUlB4cmdDSWllTGxFaUg5b29SazFQ?= =?utf-8?B?RlI5a0RwTU9Ga3pDVWpYdnpqb1plQkRaZUJnUkd1cGZ6QVNVRkdYVDcxS3NQ?= =?utf-8?B?Rld4akY2TnZhSnh2aEpidWhVN2R6bXVJV3VqaGZtRGx3NHBtSE1GV0VWamdr?= =?utf-8?B?c0tGNW5Zb1VJQ3R5K0NRTnM5QTZncFppT3NZS2tGcUtYQVN3ZUlCK0w5em9Z?= =?utf-8?B?c1gzQzUwTTh2Y2JkNytRdVZVMUlHMDhTM2lya3ZxVVFSSG94V2ZocVlFeXRr?= =?utf-8?B?OEJKSDM5OFMyOUc3ZUJlZ0ozaU84ZmQzY0tZaHZQZFRWYjNiaTlnUnRoU2hh?= =?utf-8?B?cndFZTkxWXpVdW5aUEZLb0k4WnR6V2dUTnNmM3hsSk9za1RTOE1TYVF6em9K?= =?utf-8?B?TUNLc2lFelhUeFVHNDlTdzhOWWRvU3JFWmZJcmROVnJYVEtMeDRHakxmTU1p?= =?utf-8?B?ay8xcDgybS9URDdscEVWd0hUNzhyUk9jelB3a3FuUmkyM0o3OGNyQUFhWHJL?= =?utf-8?B?SkhaOCs4RUdwa0k3ZFZTOSswLzE2OWlBaXZrdWRQOFl5RXNjcENkYXllOGRs?= =?utf-8?B?cmE2cXRydXJ5ejJoOG04U0JIOXlOc2UxWkR5eUZIQjN0UlNnKzhMMm5PcUs5?= =?utf-8?B?RUpibU9QSVVRQ1Rub0dOTmEzTks2dldlVGNCbnJkN3BGTWYvTjBYbnA4M2sw?= =?utf-8?B?ZkVyRkUySTdpTzNrVVRTRGxvdnhTdFdIcnNmTlZ3bzZ6YnEySWd4YjlJUXdh?= =?utf-8?B?ZnRSaWh2M3hHdTFxRnI1Wjd1UmxsKzNTcjh6c2ErUUZ2TXNBZlh6NFNuNVE2?= =?utf-8?B?MDM0QnpOVEdGWmd4RkNtKzNHTHNBbDdwditoTHJwZm1Gc2JvNWdWN08yNElv?= =?utf-8?B?SFZkRFhYU0o1YTV2TDBrOW0xMGVJeE5FR2FCdTNJaDQrOEpvUzY0U0dmWnoz?= =?utf-8?B?b3pnQVlod3kwZEpDZ3MyL2wzMytMckt0Ymt2OXFNOWZiYjJzZ2s5cUkwaitr?= =?utf-8?B?RlQ3cXFZSlphSVErdjc5RVdtUDZLNjNCU1lvdHNyTk5lTTNGZDBNaHFrWnRo?= =?utf-8?B?Wkp4dzIxK0JhaUZibm1IdmdDSWE4QklYbXg1TnlETFpFYkxaRmJ4TGZLeDl5?= =?utf-8?B?dmwwbFA3ZnY4Z1BjNUVmUzdRV0k5RS9wc3JEZkswcmtMNnMzVnZhQ0pocmhB?= =?utf-8?B?TWNvWnEvcld6VVJ1YmluNS9yZ0Nvc0Rsd0llUFZ0MnNUVTh0c1h6VDNlRUJz?= =?utf-8?B?NkpHS1VGSmNDOXBCVlpXcE83ZVhGeENGOGxBTkxVWUtKWEx3UmNNcmlicXV5?= =?utf-8?B?aWNFWHNLZjJMcFUzcWZ6cjByTHZBUkZNeGZMdEFIZ0RkN05qL1grSkZxQnhL?= =?utf-8?B?MTdEemdqODdVZCtEdmRmWVFXQm9DbGRTWTB4MC9CdStQSllBbG04REhIa1hn?= =?utf-8?B?Tk91cGY3UHZpLzBzbnZTR0tENkhVay84YXNhbk85cDhwWU9xbTZWeHVqcFVL?= =?utf-8?B?U3BCSkY3Y3pkbTYvcU94S2o2V2llYjd3a2NqbjRxYjdUbXhoS1hpMzEyK1Nr?= =?utf-8?B?M2d4bldLZXNsMlhUZmRlUUY1eEgzUzFvMnFRRnQwc29QdElTOUk2ZEVFMkNn?= =?utf-8?B?bDV6bVZwQ2NoNk5jVzNEcFN2R1BHUnBEaU1pdGNKR3RqNDNhZS9FcTdna3Zv?= =?utf-8?B?YnlOaTNYYTR3NmtPbW1jWGZsNlIvV3BkTWFRN3BQNVhoQVlxdzNTNGFuM2xU?= =?utf-8?B?VnByRzVnb01HTzUvQU9qZ1ZlZEZJVFM1OUZwMFhHakhTWWR0WnhMS20vbkQ1?= =?utf-8?B?T3lHYm1lWDJmSW03TEp4dDZFOVRSbHB6bVZRRWVOYk5xc04rZmdQTGsxRzUw?= =?utf-8?B?OFE9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: a849330f-9065-4540-8f64-08dacdedecca X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2022 07:31:39.0925 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: +bx3dO2y51Z1WXAcg7+84vjC+CSjcv9bPhsLk1myKYdwCg279iJSaMsUxk/JsSfDD/rz2enjwnO2zXzWVFWhMA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR10MB6615 X-TUID: lb9aajiGhaTo On 24.11.22 07:42, Uladzimir Bely wrote: > Downstreams may want to change DISTRO to some custom value. > When cross-building, this leads to downloading packages for host > and target distros to the different download subdirs. > > While base-apt is populated only from DISTRO download subdir, > second cached (ISAR_USE_CACHED_BASE_REPO = "1") build fails due to > missing packages in base-apt. > > Fix it here by populating base-apt from both download subdirs. > > Signed-off-by: Uladzimir Bely > --- > meta/recipes-devtools/base-apt/base-apt.bb | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/meta/recipes-devtools/base-apt/base-apt.bb b/meta/recipes-devtools/base-apt/base-apt.bb > index 506a28ff..e0d47625 100644 > --- a/meta/recipes-devtools/base-apt/base-apt.bb > +++ b/meta/recipes-devtools/base-apt/base-apt.bb > @@ -13,7 +13,9 @@ KEYFILES ?= "" > BASE_REPO_FEATURES ?= "" > > populate_base_apt() { > - find "${DEBDIR}"/"${DISTRO}" -name '*\.deb' | while read package; do > + distro="${1}" > + > + find "${DEBDIR}"/"${distro}" -name '*\.deb' | while read package; do > # NOTE: due to packages stored by reprepro are not modified, we can > # use search by filename to check if package is already in repo. In > # addition, md5sums are compared to ensure that the package is the > @@ -38,7 +40,7 @@ populate_base_apt() { > "${package}" > done > > - find "${DEBSRCDIR}"/"${DISTRO}" -name '*\.dsc' | while read package; do > + find "${DEBSRCDIR}"/"${distro}" -name '*\.dsc' | while read package; do > repo_add_srcpackage "${REPO_BASE_DIR}"/"${BASE_DISTRO}" \ > "${REPO_BASE_DB_DIR}"/"${BASE_DISTRO}" \ > "${BASE_DISTRO_CODENAME}" \ > @@ -66,7 +68,10 @@ repo() { > "Try it without cross-build." > fi > > - populate_base_apt > + populate_base_apt "${DISTRO}" > + if [ '${DISTRO}' != '${HOST_DISTRO}' ]; then > + populate_base_apt "${HOST_DISTRO}" > + fi This assumes BASE_DISTRO(DISTRO) == HOST_DISTRO - well... Let's do this properly, split base-apt into base-apt-{target,host}, just like isar-bootstrap. On top, we can then switch from DISTRO/HOST_DISTRO to their corresponding BASE_DISTROs, though that will be more complicated as there is no simply algorithm for BASE_DISTRO(HOST_DISTRO) - unless we assume downstream is not overloading HOST_DISTRO with anything custom. Jan > repo_sanity_test "${REPO_BASE_DIR}"/"${BASE_DISTRO}" \ > "${REPO_BASE_DB_DIR}"/"${BASE_DISTRO}" > } -- Siemens AG, Technology Competence Center Embedded Linux