From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7187509557578432512 X-Received: by 2002:ac2:46c7:0:b0:4af:ee74:aa5f with SMTP id p7-20020ac246c7000000b004afee74aa5fmr3601217lfo.24.1673472476630; Wed, 11 Jan 2023 13:27:56 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:214f:b0:4c8:8384:83f3 with SMTP id s15-20020a056512214f00b004c8838483f3ls216969lfr.3.-pod-prod-gmail; Wed, 11 Jan 2023 13:27:55 -0800 (PST) X-Google-Smtp-Source: AMrXdXsl+cmMDTyemfMA9m0E96VNf96H5MnzwH9Cioeu7u4fKlLMhZEXMnElMHclpZs7mwPefQvE X-Received: by 2002:ac2:5bc5:0:b0:4ad:5fbb:a594 with SMTP id u5-20020ac25bc5000000b004ad5fbba594mr21353702lfn.58.1673472475060; Wed, 11 Jan 2023 13:27:55 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1673472475; cv=pass; d=google.com; s=arc-20160816; b=byHPPH9f+qvZR1OTqbxUDcr0GjijBaURqjDHbqk5C8/mBmk1VpbbwhyMg8+loDAko6 sZdllxVfTs6zbhYIzRKTp0Pq7Qc6b2HDKOKkN5keYfNGz/Dolb4tatFKMLj6PcrACfOy aaGNueAoBGfwgKRyCbTDDGKRwyVz0FzfszzHa6hZGN6+iCUJq5FPmibb6RQkbq3fL2Ql 70YISHuu42P/idsguvhLVxTK05b2N8L17ygCJrvSLyJ55tpEA67hEow71peM9c+NkqM6 gancxR+ceoDIuYppDqbRQt/gqFUDCpDU0xH2FhiZL8a81ofXnQmm7RUYeXjAeHUlbaFD SB7A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:cc:to:content-language :subject:from:user-agent:date:message-id:dkim-signature; bh=xuwyMgNCnen+9G1V5lgIiivp0wSl8UY/UMtdw3XMtrQ=; b=p3VdTC0Ee93+pLFe45s8ooD86ElOF67Dwzj0+3U/g8kKFaHyIGqaI9xosYH2u348Lc vtt2YZhDmJ5KqYJwZKD5U18jMH7LLTyQDwy80faaC3XJm74tSF+FrGw2Pnn7qmux3kAe G1KHyIuIodQKJ73rXpTmMDmzJ5pzXCXjiU3JLsxdi/8oJohuPniGGk67VDOI8H+N8w1y +iGkSzcTYwdsg2d4jemKKuHBKPApef8P6YixVdADVX/rFT2DkYRoSqyiFmocJ5Z9Gd0h xzE1rjTu687YtMwstg3PDc3lJ5TlUhG41MPnf/B00+mc6WR5F1wQCx1O2KJYK0x5QPev AVPQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=kf8CAjRh; 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.8.43 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-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2043.outbound.protection.outlook.com. [40.107.8.43]) by gmr-mx.google.com with ESMTPS id c5-20020a056512324500b004b069b33a43si656967lfr.3.2023.01.11.13.27.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Jan 2023 13:27:54 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 40.107.8.43 as permitted sender) client-ip=40.107.8.43; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=kf8CAjRh; 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.8.43 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=KfIVni5NIF7y5cjtNfO9VizSAqukJZf+7eHXxTPMLFtDO4LAZ+lRLV6jg7bHdwTkMexafap9H/0Rb7U7xv04uWQr1Ibc/uhGN03z3L8OmXcvRywuRzF59iWLSLpKjql9E6jiFSoAEnConwcCArCqGquubJYqFkEjOBPo+En9ag0hGF5qUUnpcC+078j+uz1SVcJmP9C9f1vPKg7tKUxA/jE4xPtwCotGAj6bGfnvQCd+Pj5A2Wakb+cGHwBECdQD7SFDfF1rg0FbtPUxEO1wLJfuFc5hI2T6TVxHJgqWoAKPpUDs7jHWba3f9aLUO8CgrKcVUcMqikkaIOcUk4W1SQ== 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=xuwyMgNCnen+9G1V5lgIiivp0wSl8UY/UMtdw3XMtrQ=; b=VIMsSH20+qf6WK33LZ9AaJiCuy97wkaDto8OMHoOY9Ti0LZnZN6CYzxRikgrJ/BieawPUEss9/IiEaDZ0s0vjgl9hOGiH7qeoAVTUlCVyo4cyPGzThakr9ML/0fRvnSnVV4iRxCQLr/gDURkOgvTv2VjEmkc8q65ZZDSf6o4s+YmBlDmVpWfM3RDuujq3Wqr/RqWeG1TuwpQMgRBaPI8rNsxfHlNJJqtqpv71amLS9Hsdl19GBz87CmOact+gklFZJDfsH+ojR4zIFzFOTYQuCTJOngef8CMAHh/oDuX3b9mRxVpWbsjZjV9ua/S3BbaHx30HWHEbjf1z56CLe3qyw== 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=xuwyMgNCnen+9G1V5lgIiivp0wSl8UY/UMtdw3XMtrQ=; b=kf8CAjRhsxxmknk8ubRWD96GVVF/WUWlTWjeoTQ0/VKiUxIW/+B26J5fg5cdcQ/PKgZsNPJYuaZ8nDOirBElkuXqZxl7DrRCxMaDBD8cY1ZdQwFtv9Aqfxofy72c6j2wg4IZUmmgjzsWatAdXryq1sQVAFeOOjiOS617kNhjDMU07tdX/onBSrCjNIPVhllvxRGNVlLc/EJGREDUBDcFYeI40fE3TZoB/EzpPmNMkSJDNK7EblYk77CJbHk1KwfDZZRm/wBpgyVgZONoPJG+madqeMhLhFSCMQb2Sx3pNAevCX/ji9mwhSTmtNrxYx7tYbcM/7RPVaxfqlJjCm+aOA== 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 DB8PR10MB3499.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:137::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5986.18; Wed, 11 Jan 2023 21:27:53 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::784b:e95b:b855:dcc5]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::784b:e95b:b855:dcc5%6]) with mapi id 15.20.5986.018; Wed, 11 Jan 2023 21:27:53 +0000 Message-ID: <5e1b8d0a-7394-40f5-db29-2a0dedba5717@siemens.com> Date: Wed, 11 Jan 2023 22:27:49 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 From: Jan Kiszka Subject: [PATCH] dpkg: Align apt configuration of devshell with build Content-Language: en-US To: isar-users Cc: Uladzimir Bely Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR0P281CA0092.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a9::13) 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_|DB8PR10MB3499:EE_ X-MS-Office365-Filtering-Correlation-Id: 1dd1fb31-cf32-45dc-01f0-08daf41ab2a6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5o0vIWMT8YTrTk8PT4u5i2e3ADC/ugepEOG0pwlKI2b4eoaPmaJP9eox3RzMLjpba0d9+TmrroJM7y6B6j7hPBxKIMBPOvyRxkg2gq1WENNojin0mtF6o18+Gdir48VTIjreS46iqqSbH+6+zMiOsb281nKAq9jVbLCJ1VBUtb3bV5CGXeWcRid1EQlIlsAdI+nGyxtU4MwuuYDUzip6GM6/GMB6uIzi8U+wxyEscBpYgABwP58D3g23R2NPxFws0EwczpL6wurgJ3BvVJG7rpDVZq3raoswPLsYfr4Czm9cE0O57HVy06O2x0IFHEIrCesMF783nK1AgljQXudSWyRA30JZEYG+k1k/YDWXHq8jisLN3FQLWKr8VIMm4U5v4lXWWkOSx1QpN+E5fOLcVLBXCXqUutZLCqRz/C8SFFupktDrVl2gozvIU+PklixHo1AHN+eVD9vw0/ij2tfd5ivdr2cd9ED+4tfE7572gAjZ4TBwi+VL9ZQbv/dm9YsWWmzTndkFQhV4urjlpewzM5mq6rSVo6XJfwSRJ1igbdch/bhMu/Z5wYwb22cNi+hDbePBjlWpaqdsJEQp3WMCk8aTU3n5z8iBh8JuoR0k1tN8VkKC5hor3ylhftWB21HijeemYe8x0AYF19fSdSy1t74Z/b9mCcsD3/0zQIErxRCnfFkQmXHnp+/WDCoivb0GTAib69kd7KuwvzNC5jZAzyjFEW99mWeZ0zlQ+0gZpMs= 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)(396003)(366004)(136003)(39860400002)(346002)(376002)(451199015)(316002)(186003)(26005)(5660300002)(6512007)(44832011)(6486002)(478600001)(2616005)(41300700001)(31696002)(66556008)(66946007)(66476007)(4326008)(8676002)(6916009)(8936002)(83380400001)(86362001)(36756003)(6666004)(31686004)(6506007)(82960400001)(38100700002)(2906002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?L3g5Um92eWI4RmlZSjVtOXRFOUwzK2xSa3YrcUhSWlhoSTEzbHBReVBUK296?= =?utf-8?B?c2F5NStPcW5FL1I5U3htMDZrT0xHTE96K2lCWWJjTnozL0s0UXkxTFNVQTY1?= =?utf-8?B?MDRGN3k3T05qVHlaNVNFajZsSGd3RWxkVVJISytaUnVya2lRUnMrcFhsbWhU?= =?utf-8?B?VlVYa0NYUnN0RzRLeWJaWWpqaVdhdDlNK3lOTlRrR3hzZ2RldURiSFVET1RF?= =?utf-8?B?bWlCQ04rdXRXZzRMUzg5eFk5bUJKR0czOTNrV1hkdHdGTFVpQ1ptVnljV3Ft?= =?utf-8?B?T1dWOTVGZGt5QTkwbDZlL0pWQXhvNjRIb3A5QU1HNmpFcmt0SytzZkFxN1FI?= =?utf-8?B?U2JZbFFFeEVVeUsrNTk3WDBLUzl0WkpsMFBJMWo5MWVFL2JncTVYcGpMczhT?= =?utf-8?B?Y3l0MHFDWjR4M093b2dERWF6MjEwZXM0NzNPdnFTYnJaa2tSVGh3TytVa1M5?= =?utf-8?B?SGpUaXd3T3BDdWtXVXJ4VmdwZUp2YjBuYlppSjlycE1tSEV2YnJ3QVVFc1cw?= =?utf-8?B?WVdxa0hGS00xRVZvNmxiRk81S0xyR1BiQXh0cWhuWFc5VlNJY3k5M2pNWmg1?= =?utf-8?B?RFpUTk1ESU9QMFJzK1BKMkFJY1ZKZkZ3RGRQc3VlcVdwalhGdGh6OTcwL0N3?= =?utf-8?B?L1NrZXd5bXIwS0ZxaEVSYVNEUkNqSFV0R09EWG1IOHFkQTh6TzJoM0hMNEl6?= =?utf-8?B?YzFNYU5reHlrSVEyMEVCY2U1R0U5eFRjakZPVFlyMUFhUlNzeFFST05lODY2?= =?utf-8?B?RVFxNXhKQkVuSUpFWFNVVk9pRWxkSFZ0Uk5DNjk0NGRqR1pYQ2JoSHp5UkMy?= =?utf-8?B?UStoU0UwSnZTdDZuS3pMNWRtRytzaUhneEFjMXpyeC9mUEVlOERjaXMraExN?= =?utf-8?B?V3Q2ZWFPaGxyMThQV0U1TTF5aUlDQ2FBOFF2Q0lZR09FWmIvWVVvMXF5eVJ1?= =?utf-8?B?eXZkNFZ4T1JJQXRPQjBHNWU3dVdhbHA5VzJtOFJJWDl1Z1M2LzdFV3ZzZlIv?= =?utf-8?B?VkE2bGlPZVFxUzZXalpNaUhkcU8rZEVXeWdDcC9kTTdyQkxybGlja2d4ZHJz?= =?utf-8?B?TXR4d2JySGJsOEVEdWl5N2dUSWxVTXMrK1RzRFZYUnhvU2dGbEw1ODRiL2pz?= =?utf-8?B?M3NCS0ZiYjdiTk5Sclo1SVBXb0pNZzRWRjlUa25zMTk0eFZEVGRnZzliOU1S?= =?utf-8?B?US91bXYvcmx0RW1MdFFMR0h6MldtbmU4TTJ3QzlaOHRtQkFqaVdyRFd1RS93?= =?utf-8?B?M0V0UVRUOVAvbzk3ZEdYSDNvQW0ra1FiZlJySGl4U20zWGVBeWtnSVMrR2NJ?= =?utf-8?B?Uit1VlZkaW80NDRQY2VnV28xbGR1a3JkaGJMZHE3QjB3NW1mMjFWY3NhRkUx?= =?utf-8?B?bElpWGo4c3kxaTI5Z3FHVjNwbmw5dFlOVUlHYlFlQ2F6RFRXSkRGZG9wZlRN?= =?utf-8?B?eTA0RHhQWkNMditvMUFvWG0rWDFnVWZBMTJBdWJzNmJtZWxXTG5yRitoQU5F?= =?utf-8?B?VDRXaGJBN2gxblBVellHTlVXU2tZT0JJWVcyZFRFd1lITFYvWXhQR0VWbUlp?= =?utf-8?B?UGt3elh4MlNuMkpybEdkalkrcDVSRGx6T1Vzdm9ZRm9TVUlhWU90ZUJFaXh6?= =?utf-8?B?MWs0SXdwRmdkOEh0dGphcVhBaTZiN1ZDOVpwTlYrU2k4Y0prL2VTZWg0cTN3?= =?utf-8?B?dGhEZjVyZGRkVU42ditzSFd4Y29iQ09xRjN1Njkvcm1XZGtzNlFkWjYyUi9i?= =?utf-8?B?dDBtMzZJTVkrejZxYXhpQ2ZuYWtVa3RWa0NiQS9jSG1rc1BidmpzT3ZMejVO?= =?utf-8?B?MVhlVU4zT0UrVFk5cjI1d0x0RlZhN3cwQUpuU080Ky85emJyeXJ3cGlCSHpp?= =?utf-8?B?MGNURVJldnVXempWdU9HbFd6RjRHOERZSFdUTHo3VE9WUUJzazY5REs2dWZi?= =?utf-8?B?akQ4Y2dGT29LeE1xS1ZsV2pEa1NUTUYzUDR0dDA0dnZhWnhNVzdhbXpSU1NF?= =?utf-8?B?eloyV1ZnYjE2WFpKMVNiRVI2c05vSmxjVzhIMkxQSGZGWkRKWDJ1aFlmNVNp?= =?utf-8?B?ZUNPcUsvZzlRTmRYaDNIRDJuSXFidmZldHljT0s0Ulk4NnM2Uk5Da20yek1k?= =?utf-8?B?L0FTcDNqUE9IdHZWUEx0TkdZVG5ZNVFldlk4NGZzSHM0Rkt6bzlaZ0x5RUsv?= =?utf-8?B?Qnc9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1dd1fb31-cf32-45dc-01f0-08daf41ab2a6 X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2023 21:27:53.1147 (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: 1bGPqHTPQFxfb86qN4nJB8XGwNQD6fv73miO54/8LtLFYrgPm9oSvT4MlUTt6fO3xY7NXtAkR6Z0HN4Uvq5CQg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR10MB3499 X-TUID: 63D8oYUAe3Sc From: Jan Kiszka That was missing in e9bdd210c43c and 8e524d6787e2. Signed-off-by: Jan Kiszka --- meta/classes/dpkg-base.bbclass | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 61bf48ef..05fd0650 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -292,6 +292,7 @@ python do_devshell() { pkg_arch = d.getVar('PACKAGE_ARCH', True) build_arch = d.getVar('SBUILD_HOST_ARCH', True) pp_pps = os.path.join(d.getVar('PP'), d.getVar('PPS')) + debdistroname = d.getVar('DEBDISTRONAME') install_deps = ":" if d.getVar('BB_CURRENTTASK') == "devshell_nodeps" else f"mk-build-deps -i \ --host-arch {pkg_arch} --build-arch {build_arch} \ @@ -301,12 +302,14 @@ python do_devshell() { termcmd = "schroot -d / -c {0} -u root -- sh -c ' \ cd {1}; \ echo {2} > /etc/apt/sources.list.d/isar_apt.list; \ + echo \"Package: *\nPin: release n={3}\nPin-Priority: 1000\" > /etc/apt/preferences.d/isar-apt; \ + echo \"APT::Get::allow-downgrades 1;\" > /etc/apt/apt.conf.d/50isar-apt; \ apt-get -y -q update; \ - {3}; \ + {4}; \ export PATH=$PATH_PREPEND:$PATH; \ $SHELL -i \ '" - oe_terminal(termcmd.format(schroot, pp_pps, isar_apt, install_deps), "Isar devshell", d) + oe_terminal(termcmd.format(schroot, pp_pps, isar_apt, debdistroname, install_deps), "Isar devshell", d) bb.build.exec_func('schroot_delete_configs', d) } -- 2.35.3