From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 12 Feb 2024 21:46:10 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1rZdBp-003qDs-3D for lore@lore.pengutronix.de; Mon, 12 Feb 2024 21:46:10 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1rZdBp-0006eI-Ew; Mon, 12 Feb 2024 21:46:09 +0100 Received: from mail-vi1eur04on2130.outbound.protection.outlook.com ([40.107.8.130] helo=EUR04-VI1-obe.outbound.protection.outlook.com) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rZdBK-0006W4-GZ for ptxdist@pengutronix.de; Mon, 12 Feb 2024 21:45:39 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KMDT9KQX7ORwkdIJM+JGdixYYyQ9D5LRHE4mUVJQet5n6gxbO5UpHegdDmWXE1Czt1z1TPO0oj3PEoNm2M4EefnR1ftUpl03i+3AJ0EA4TRUDWluEfhx4KCJuEDZFvE4Wj/UqaUAqA4Xge8BFrhwUTlwmj0ISEt0W1LZ3EYxgzIJGp2Ue5FsUlMbs4PpYEOWoexpkGuv/bDdFqoGuYBMQU0otPv5E67TStxrGe4Ggm+6OfMOpxCNXAWurQIV7YVEs8PwkgxhqpVRrMP9UpOUvLU1OQ8HXq+6RmtHuj4as6x3Fgm+dp7n+5XVXs3m9v907h8g4v61Z7VWQ5di6vPDoQ== 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=0qK4xav2tihib2bQaIvqOxYW/jV5iSzsnzvx6SsCnHI=; b=WATZ22AkX8InzmXCK/vel6uCp/e3OIdZGDEE3+poNFeOlxqLy0mjNqkpTDNKR1dknbfmql8qCrj1DpgbkRB+oRtxRkPG0iOfNrqTguMPlGSFZ4O8DLAZRzgaW9cQ7F431j/rbdZ23rsSZH0y2iEbxGtVCjoPpRciDKyRekyjBqit0H0dZj3oUKIJG96Qev5OptfFBfReokg6vmKjKgRssmw+yv63rDELkfveFtsMFFq1SWeIZd5AXgeRaYZOr5iYYJebUwc8Zn0LLdeqftVEYvdHae0jHjTCqCz8VtOkuCr36EAUAajiL2L+HwiZrl6vHhILB+pyMX3fBVndUfLA9w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=t2data.com; dmarc=pass action=none header.from=t2data.com; dkim=pass header.d=t2data.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=t2datacom.onmicrosoft.com; s=selector1-t2datacom-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0qK4xav2tihib2bQaIvqOxYW/jV5iSzsnzvx6SsCnHI=; b=YxyOWkuB3/UTPVAOcesPnjlkLeaVI9rRiXpjUjhzPYVoTbngU7XGUTUaLrycq9oreRw4U/tidVcONwnjWaW2OZcSutD/+HkJanm64cWekLQEygQnOpczs5keEO1Au+x0mAKMLEqLMbXDXeW3ND9gR7dYqeF2WJ45lhvWzjfhBSA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=t2data.com; Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) by PAXP251MB0579.EURP251.PROD.OUTLOOK.COM (2603:10a6:102:284::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.38; Mon, 12 Feb 2024 20:45:33 +0000 Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::1398:9f4f:da3f:1862]) by DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::1398:9f4f:da3f:1862%3]) with mapi id 15.20.7270.033; Mon, 12 Feb 2024 20:45:33 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Mon, 12 Feb 2024 21:45:19 +0100 Message-Id: <20240212204520.1168713-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.34.1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: GV3P280CA0009.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:b::25) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9P251MB0618:EE_|PAXP251MB0579:EE_ X-MS-Office365-Filtering-Correlation-Id: c6c2013e-42ab-463e-047f-08dc2c0b8e9b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nYyvOicW/A1xIQ0WawK+HiN+/Kj/6OziMbWg15LhhGTPHw6KRL61NRtyHVduaT/Y2ol1kEq/xgVpdGt5AGTm6ozLEsLHaA7U+/cySBn7Zja+OF3Mf+jpQbzw/nqpW/7d+KbDao80fo7Mm2vcXy0GZRtFzJ+An8pnnnPQvefIjOK+MgWapKSqweSywt03e+9ZINAGB1xQNkycxEVW8Rgvk0Vo6lzGCmCyqEE7reDwKyAXedS0LhON73/Thsr9QuX9mHnEg+GHKucU7jVYEzzT165S1r/zsxHjNmqECGB7FbCWeQ+cb7q7TX4R0Bwq/dBRs+iXRpWgbiAuxCKviFQf7NgsJPdk7/fdSRhP0QvsMldSMz2e935qsPoUSsywXrilho6k5RtyAF8vWTqUPwanZHKTXvOQZWZrZfr6f5G5PltouBFIAkP1ZLU7syICGJ9n/iNyklOjR3I+uI3GBMWUhg6R3zUc8dx1RE1vZgvdKXlv5wxnTzGFoawf5wh2Widiv68ikIbWSTfHkkVj/rzRXmRQROMunokkCwsOG+GAroZQJQnHwRqGymUK2YMD+Bb8ikZQbmCNk+/dDvwzITpxNBU+vFxGp73miPEimDkGBhQ= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9P251MB0618.EURP251.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230031)(366004)(136003)(346002)(39830400003)(396003)(376002)(230922051799003)(186009)(1800799012)(64100799003)(451199024)(36756003)(38350700005)(2616005)(1076003)(26005)(41300700001)(478600001)(8676002)(8936002)(66574015)(966005)(83380400001)(66946007)(66556008)(66476007)(6916009)(5660300002)(30864003)(52116002)(6512007)(6666004)(6506007)(316002)(19627235002)(86362001)(6486002)(38100700002)(44832011)(2906002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SFRRbFlGOXpHdkpxdGU4aXJzVFplemdtTzE4OGx6TXJvV0szeG11NTMrUmVk?= =?utf-8?B?VVZkUnpGNzJsNE5wQ1J1VzdsRnVSN1gvbzdmRE5GOWJrb1haRUZMREpMU2Nh?= =?utf-8?B?VG1SNUhjM3g0Nk9LOUFNQzJaa1dSZnVpV1R5OXNNUnAwUmpqQXBDOWo2WDly?= =?utf-8?B?M0R1ZzlTbkdVSWRuaTNSK204QW5HaTZrRC9penVIb2lENkU2TWVNZHpTMm15?= =?utf-8?B?RlVSS2V0NURhVDI5Ly8xNnRiM2p4SmVJN253UWRvYnN3YzNYTGxXQVJHWGNp?= =?utf-8?B?WDFWK1JtQW9QUXFkRG9TOTcya2poWGZIVWkzM1UzMHNCdUNQQ1BHYnpBaEhu?= =?utf-8?B?SnZDaW03U1pPL1JvbXYzNHB5NUZLWEowMEg3VWppcjI3WUI1RWV5VURUZ2th?= =?utf-8?B?Rm91Z0lPK29PNWlldGx5My9nc1BaS0puOE5VOGVFNnlDT3hEdy9UeEdFL29Q?= =?utf-8?B?UDNhbWh2eE5USS92VjJ1SFJ1cWFOT1JMQ2lPT211SGVGNmJhQ0w1eDQvNkVn?= =?utf-8?B?ME13UklwQ3MwYXQ5R05WNG5ERjBqeTY1S1JKMEkwM1YvK2tWbW04WWk4SFZl?= =?utf-8?B?Uk4zV0RINWp4SEVDaTc1UmJLdDdCdGk0VUlBZm1Ybi9lQWg5MVI4RThDNThW?= =?utf-8?B?aFpCdWh5QS9DZmo2dFA1QzdHb1pVcnJ6QXhkTWlTSE5EUEthdkJzdTRpYWx5?= =?utf-8?B?bnBDTHFvV0U4d1k0cmt3Q05HU0s1SkZWU1oySG9YUXVacVJIbE5ZU3lOQ2F0?= =?utf-8?B?cFZ3b3AwK3pscEZsVDhxT1ZoQVJxdHpqSHFmQjVRT1gwZjlSdWpyOG8vMFNp?= =?utf-8?B?K1p5ZXJBdWZDUGJkTnU2VEd5Z2lkWHRHSllMWVJjUmx5VUc3VVVLVFBhV0xq?= =?utf-8?B?cWcvREwrQ1pLM29SSXA0Ky9pbEY2U2NOOEljUy9NUFFwOHVuZ3FoRzk1WUlw?= =?utf-8?B?eVBYaHNlYUNPay9PazVKWWpoSmEzOE5FNXBTcFhOdUFNSTljVm9SdXE0THN2?= =?utf-8?B?SnlNSjJkdmx6bWpxR3RZSVprM2VtWldYcTRrK3JhR0pJbWFQNDlWNmpOTmo5?= =?utf-8?B?UWpnc3AvdkhjdE9Va2t0cmdCVkxuZUxydHZKcE1vamV4SENmcDg2RFN2RldD?= =?utf-8?B?T1ZPTkJVcXFWZldyd25la2t3bmJHV0ZhM3lRcWV1eHM1YUJnamtJbHZvTE5v?= =?utf-8?B?UjVKb1pFaU1YSzQ5emtRRjR3Qm5nNFZGOEc5YllCbGVxNWpXWFhiWndFTTJm?= =?utf-8?B?a2NGWFZ6VXl2S3pDUUdzR09iZ1MxUUY4SkNDRml4dFNrVkJRbFlzOVdHc3c3?= =?utf-8?B?RkxxaXB2SENQdkVDS05PaEtVanpTVndtZ2UrUXRDMUJJSytoN3VybmNYSENl?= =?utf-8?B?djVjQnQ4TS9BSVJBMXNkODA1cERLYmI3ZEhDWFRhOFE1ZHZpUDNRc0Y1akJZ?= =?utf-8?B?dXZJTmdteW9YUnM5SDlyRDFreG9hUmFQTHcwdldtVnlpWVBhRGlqOVprK2Np?= =?utf-8?B?V1hWUDVjYzlGOFdaejloMmZIUVU1VDZjMnNpZVNaQXBqK3FlNVB0NS9CdGRW?= =?utf-8?B?V2FEdGtTVmkyRjM1V3kxZEZXQVZRMzA5TmphazZDUkhCb1hhMUpxYWU4M1ZL?= =?utf-8?B?Q1NNb0lnVVBJMW0xdndTd2NKV2NlbHprZnF0Z2VVcnY1NTBGa1ZSUkxDTU4x?= =?utf-8?B?amg5ZXcxM1dXTzNkK0tkSWdNYkkzR09TM1NOZ2dwR3hLQUo5MStncEc0Y1Ax?= =?utf-8?B?ajBqbGdTOHhYOCt4YVIzWEZtSnFubk9lalh6YmJ5U0F2UUt0RFV0SGdkMmUw?= =?utf-8?B?NlBWSDlrTXA5K3FLVTJsa1Uvd3g2VmdOU3FkVGl3ckFseUJRRSs1OUpsS3BL?= =?utf-8?B?RzZPMTNHeWZRL2ZlU2RTbVRvdkorVjg4UVlRbzc1UG9VWTBKaVgrbG5OVnFy?= =?utf-8?B?T3BFMHExS1BteUNnOVp3eE9ra2VrRjFjeEhKQVZzMnA3N3JvcnlLS2t4L1J2?= =?utf-8?B?dzNLdDFpTkU4U3NlQmRYbUpiZlF6a290TXVXazdXNHEyWGhra2x0TU4wZlVW?= =?utf-8?B?ZTRVQXRoSE1tb2JTS0JiUktJclVUZExzTzh1aEh6cW8zMlBJM21XT2dYRTRp?= =?utf-8?B?eUdqQnR5dnRtZEJ1ZmI0SFpRaktWMUdnSlBqVmx1Q3pUMVFQS21oSVRMaUt2?= =?utf-8?B?aWc9PQ==?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: c6c2013e-42ab-463e-047f-08dc2c0b8e9b X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2024 20:45:32.9916 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 27928da5-aacd-4ba1-9566-c748a6863e6c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: yZ0p2UNUdiQdVVOtR2t4t1zl/2Xkyzkgdx4D/fN/18fQQOGcAqKdtLOqNlybomaqILZzw+UCTz8/ivBBQQUXTnMGfHS/fCKH70UKFQXMIiY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXP251MB0579 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] host-opkg-utils: Version bump. 0.5.0 -> 0.6.3 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 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.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false https://git.yoctoproject.org/opkg-utils/log/?h=0.6.3 Added acls and xattrs. Not sure they'll be used? Othersise, minor changes. Looks like they're trying to follow the opkg version number. * Rework the patch set. Try to follow the intentions of the previous diff. Signed-off-by: Christian Melki --- ...ld-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch | 38 -------------- ...0100-opkg-build-use-CROSS_COMPILE-ar.patch | 10 ++-- .../0101-Update-Installed-Size-properly.patch | 6 +-- ...xdist-the-maxium-UID-for-system-user.patch | 4 +- ...ld-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch | 52 +++++++++++++++++++ ...pkg-build-fix-typo-in-compressorargs.patch | 4 +- .../series | 0 rules/host-opkg-utils.make | 4 +- 8 files changed, 66 insertions(+), 52 deletions(-) delete mode 100644 patches/opkg-utils-0.5.0/0103-Revert-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch rename patches/{opkg-utils-0.5.0 => opkg-utils-0.6.3}/0100-opkg-build-use-CROSS_COMPILE-ar.patch (59%) rename patches/{opkg-utils-0.5.0 => opkg-utils-0.6.3}/0101-Update-Installed-Size-properly.patch (91%) rename patches/{opkg-utils-0.5.0 => opkg-utils-0.6.3}/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch (95%) create mode 100644 patches/opkg-utils-0.6.3/0103-Revert-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch rename patches/{opkg-utils-0.5.0 => opkg-utils-0.6.3}/0104-opkg-build-fix-typo-in-compressorargs.patch (86%) rename patches/{opkg-utils-0.5.0 => opkg-utils-0.6.3}/series (100%) diff --git a/patches/opkg-utils-0.5.0/0103-Revert-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch b/patches/opkg-utils-0.5.0/0103-Revert-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch deleted file mode 100644 index b855eec53..000000000 --- a/patches/opkg-utils-0.5.0/0103-Revert-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Michael Olbrich -Date: Sat, 25 Jan 2020 18:28:40 +0100 -Subject: [PATCH] Revert "opkg-build: clamp mtimes to SOURCE_DATE_EPOCH" - -This reverts commit c3cc95693048bdd57a82069bad47abbc72a1932e. - -We set the mtime already in PTXdist so it's not needed and this breaks -building with tar <= 1.28 (e.g. CentOS 7). - -Signed-off-by: Michael Olbrich ---- - opkg-build | 9 +-------- - 1 file changed, 1 insertion(+), 8 deletions(-) - -diff --git a/opkg-build b/opkg-build -index 6d6f7e92b919..2fb6216104b6 100755 ---- a/opkg-build -+++ b/opkg-build -@@ -298,18 +298,11 @@ mkdir $tmp_dir - - build_date="${SOURCE_DATE_EPOCH:-$(date +%s)}" - --mtime_args="" --# --clamp-mtime requires tar > 1.28. Only use it if SOURCE_DATE_EPOCH is set, to avoid having a generic case dependency on tar > 1.28. --# this setting will make sure files generated at build time have consistent mtimes, for reproducible builds. --if [ ! -z "$SOURCE_DATE_EPOCH" ]; then -- mtime_args="--mtime=@$build_date --clamp-mtime" --fi -- - export LANG=C - export LC_ALL=C - ( cd $pkg_dir/$CONTROL && find . -type f | sort > $tmp_dir/control_list ) - ( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print | sort > $tmp_dir/file_list ) --( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion $mtime_args -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) -+( cd $pkg_dir && tar $ogargs $tsortargs --no-recursion -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) - ( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --no-recursion --mtime=@$build_date -c $tarformat -T $tmp_dir/control_list | gzip $zipargs > $tmp_dir/control.tar.gz ) - rm $tmp_dir/file_list - rm $tmp_dir/control_list diff --git a/patches/opkg-utils-0.5.0/0100-opkg-build-use-CROSS_COMPILE-ar.patch b/patches/opkg-utils-0.6.3/0100-opkg-build-use-CROSS_COMPILE-ar.patch similarity index 59% rename from patches/opkg-utils-0.5.0/0100-opkg-build-use-CROSS_COMPILE-ar.patch rename to patches/opkg-utils-0.6.3/0100-opkg-build-use-CROSS_COMPILE-ar.patch index 9e54dd0ec..556092909 100644 --- a/patches/opkg-utils-0.5.0/0100-opkg-build-use-CROSS_COMPILE-ar.patch +++ b/patches/opkg-utils-0.6.3/0100-opkg-build-use-CROSS_COMPILE-ar.patch @@ -14,15 +14,15 @@ Signed-off-by: Andreas Bießmann 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opkg-build b/opkg-build -index 1b564166a7a4..eca1ee2fa42c 100755 +index 6edd938b8f7e..ef2fbfa42c09 100755 --- a/opkg-build +++ b/opkg-build -@@ -324,7 +324,7 @@ fi +@@ -352,7 +352,7 @@ fi rm -f $pkg_file if [ "$outer" = "ar" ] ; then -- ( cd $tmp_dir && ar -crfD $pkg_file ./debian-binary ./control.tar.gz ./data.tar.$cext ) -+ ( cd $tmp_dir && ${CROSS_COMPILE}ar -crfD $pkg_file ./debian-binary ./control.tar.gz ./data.tar.$cext ) +- ( cd $tmp_dir && ar -crfD $pkg_file ./debian-binary ./control.tar.gz ./data.tar.$cext ) ++ ( cd $tmp_dir && ${CROSS_COMPILE}ar -crfD $pkg_file ./debian-binary ./control.tar.gz ./data.tar.$cext ) else - ( cd $tmp_dir && tar -c $tsortargs --mtime=@$build_date $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file ) + ( cd $tmp_dir && tar -c $tsortargs $mtime_args $tarformat ./debian-binary ./control.tar.gz ./data.tar.$cext | gzip $zipargs > $pkg_file ) fi diff --git a/patches/opkg-utils-0.5.0/0101-Update-Installed-Size-properly.patch b/patches/opkg-utils-0.6.3/0101-Update-Installed-Size-properly.patch similarity index 91% rename from patches/opkg-utils-0.5.0/0101-Update-Installed-Size-properly.patch rename to patches/opkg-utils-0.6.3/0101-Update-Installed-Size-properly.patch index 3f617eaff..48a00ff9a 100644 --- a/patches/opkg-utils-0.5.0/0101-Update-Installed-Size-properly.patch +++ b/patches/opkg-utils-0.6.3/0101-Update-Installed-Size-properly.patch @@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opkg.py b/opkg.py -index ba947c2e887b..7b7e216419a1 100644 +index e5a65dd1ae8f..ec77c147156c 100644 --- a/opkg.py +++ b/opkg.py -@@ -248,7 +248,7 @@ class Package(object): +@@ -276,7 +276,7 @@ class Package(object): lineparts = re.match(r'([\w-]*?):\s*(.*)', line) if lineparts: name = lineparts.group(1) @@ -23,7 +23,7 @@ index ba947c2e887b..7b7e216419a1 100644 value = lineparts.group(2) while 1: line = control.readline().rstrip() -@@ -510,7 +510,7 @@ class Package(object): +@@ -538,7 +538,7 @@ class Package(object): if 'sha256' in checksum: if self.sha256: out = out + "SHA256sum: %s\n" % (self.sha256) if self.size: out = out + "Size: %d\n" % int(self.size) diff --git a/patches/opkg-utils-0.5.0/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch b/patches/opkg-utils-0.6.3/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch similarity index 95% rename from patches/opkg-utils-0.5.0/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch rename to patches/opkg-utils-0.6.3/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch index 8a1df58e1..ba8c852a1 100644 --- a/patches/opkg-utils-0.5.0/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch +++ b/patches/opkg-utils-0.6.3/0102-opkg-build-in-ptxdist-the-maxium-UID-for-system-user.patch @@ -8,11 +8,11 @@ Signed-off-by: Michael Olbrich 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/opkg-build b/opkg-build -index eca1ee2fa42c..6d6f7e92b919 100755 +index ef2fbfa42c09..6a1b631fc5d5 100755 --- a/opkg-build +++ b/opkg-build @@ -69,14 +69,14 @@ You probably want to remove them: " >&2 - fi + fi fi - large_uid_files=`find . -uid +99 -ls -printf '\\\n' || true` diff --git a/patches/opkg-utils-0.6.3/0103-Revert-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch b/patches/opkg-utils-0.6.3/0103-Revert-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch new file mode 100644 index 000000000..b3c38ac3c --- /dev/null +++ b/patches/opkg-utils-0.6.3/0103-Revert-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch @@ -0,0 +1,52 @@ +From: Michael Olbrich +Date: Sat, 25 Jan 2020 18:28:40 +0100 +Subject: [PATCH] Revert "opkg-build: clamp mtimes to SOURCE_DATE_EPOCH" + +This reverts commit c3cc95693048bdd57a82069bad47abbc72a1932e. + +We set the mtime already in PTXdist so it's not needed and this breaks +building with tar <= 1.28 (e.g. CentOS 7). + +Signed-off-by: Michael Olbrich +--- + opkg-build | 23 ++--------------------- + 1 file changed, 2 insertions(+), 21 deletions(-) + +diff --git a/opkg-build b/opkg-build +index 6a1b631fc5d5..182e5d7f318d 100755 +--- a/opkg-build ++++ b/opkg-build +@@ -314,31 +314,12 @@ fi + tmp_dir=$dest_dir/IPKG_BUILD.$$ + mkdir $tmp_dir + +-mtime_args="--mtime=@${SOURCE_DATE_EPOCH:-$(date +%s)}" +-# --clamp-mtime requires tar > 1.28. Only use it if SOURCE_DATE_EPOCH is set, to avoid having a generic case dependency on tar > 1.28. +-# this setting will make sure files generated at build time have consistent mtimes, for reproducible builds. +-if [ ! -z "$SOURCE_DATE_EPOCH" ]; then +- mtime_args="$mtime_args --clamp-mtime" +-fi +- +-# Notice, that if you create an archive in POSIX format (see section GNU tar and POSIX tar) and the environment variable POSIXLY_CORRECT is set, +-# then the two archives created using the same options on the same set of files will not be byte-to-byte equivalent even with the above option. +-# This is because the posix default for extended header names includes the PID of the tar process, which is different at each run. To produce +-# byte-to-byte equivalent archives in this case, either unset POSIXLY_CORRECT, or use the following option: +-# +-# --pax-option=exthdr.name=%d/PaxHeaders/%f,atime:=0,ctime:=0 +-# +-# https://www.gnu.org/software/tar/manual/html_node/PAX-keywords.html +-if [[ "$tarformat" == "--format=posix" ]]; then +- mtime_args="$mtime_args --pax-option=exthdr.name=%d/PaxHeaders/%f,atime:=0,ctime:=0" +-fi +- + export LANG=C + export LC_ALL=C + ( cd $pkg_dir/$CONTROL && find . -type f | sort > $tmp_dir/control_list ) + ( cd $pkg_dir && find . -path ./$CONTROL -prune -o -path . -o -print | sort > $tmp_dir/file_list ) +-( cd $pkg_dir && tar $attributesargs $ogargs $tsortargs --numeric-owner --no-recursion $mtime_args -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) +-( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --no-recursion $mtime_args -c $tarformat -T $tmp_dir/control_list | gzip $zipargs > $tmp_dir/control.tar.gz ) ++( cd $pkg_dir && tar $attributesargs $ogargs $tsortargs --numeric-owner --no-recursion -c $tarformat -T $tmp_dir/file_list | $compressor $compressorargs > $tmp_dir/data.tar.$cext ) ++( cd $pkg_dir/$CONTROL && tar $ogargs $tsortargs --no-recursion --mtime=@$build_date -c $tarformat -T $tmp_dir/control_list | gzip $zipargs > $tmp_dir/control.tar.gz ) + rm $tmp_dir/file_list + rm $tmp_dir/control_list + diff --git a/patches/opkg-utils-0.5.0/0104-opkg-build-fix-typo-in-compressorargs.patch b/patches/opkg-utils-0.6.3/0104-opkg-build-fix-typo-in-compressorargs.patch similarity index 86% rename from patches/opkg-utils-0.5.0/0104-opkg-build-fix-typo-in-compressorargs.patch rename to patches/opkg-utils-0.6.3/0104-opkg-build-fix-typo-in-compressorargs.patch index ea791bbc2..b7dd1f111 100644 --- a/patches/opkg-utils-0.5.0/0104-opkg-build-fix-typo-in-compressorargs.patch +++ b/patches/opkg-utils-0.6.3/0104-opkg-build-fix-typo-in-compressorargs.patch @@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opkg-build b/opkg-build -index 2fb6216104b6..7e1a1af99948 100755 +index 182e5d7f318d..dd8906320200 100755 --- a/opkg-build +++ b/opkg-build -@@ -236,7 +236,7 @@ if gzip --help 2>&1 | grep -- "-T" > /dev/null; then +@@ -252,7 +252,7 @@ if gzip --help 2>&1 | grep -- "-T" > /dev/null; then zipargs="-9nT" fi diff --git a/patches/opkg-utils-0.5.0/series b/patches/opkg-utils-0.6.3/series similarity index 100% rename from patches/opkg-utils-0.5.0/series rename to patches/opkg-utils-0.6.3/series diff --git a/rules/host-opkg-utils.make b/rules/host-opkg-utils.make index a9af478ff..a35a0da0d 100644 --- a/rules/host-opkg-utils.make +++ b/rules/host-opkg-utils.make @@ -14,8 +14,8 @@ HOST_PACKAGES-$(PTXCONF_HOST_OPKG_UTILS) += host-opkg-utils # # Paths and names # -HOST_OPKG_UTILS_VERSION := 0.5.0 -HOST_OPKG_UTILS_MD5 := c71939ee02c69462bd3ba1fe0d6de5e2 +HOST_OPKG_UTILS_VERSION := 0.6.3 +HOST_OPKG_UTILS_MD5 := 2ca116eda29e0be4a89e92a9b24bda53 HOST_OPKG_UTILS := opkg-utils-$(HOST_OPKG_UTILS_VERSION) HOST_OPKG_UTILS_SUFFIX := tar.gz HOST_OPKG_UTILS_URL := https://git.yoctoproject.org/opkg-utils/snapshot/$(HOST_OPKG_UTILS).$(HOST_OPKG_UTILS_SUFFIX) -- 2.34.1