From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 17 Feb 2022 13:55:53 +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 1nKgK9-001mwT-Ha for lore@lore.pengutronix.de; Thu, 17 Feb 2022 13:55:53 +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 1nKgK8-0005fI-Fp; Thu, 17 Feb 2022 13:55:52 +0100 Received: from mail-vi1eur05on2053.outbound.protection.outlook.com ([40.107.21.53] 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 1nKgJV-0005cc-Jd for ptxdist@pengutronix.de; Thu, 17 Feb 2022 13:55:14 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RSaD4zydlWJqu9a03ApxsoArtn6U+zW+Er5lsCjqD5fxmV0eR0yEbiA0nn0i7pS98pBxIYWslL8zs9vITVDLf+yi62A0Rp43wgDmM0znYY/1MZPysWPJ4vyp4vkGl47UIWtzFtqqu+qg1WjL763CSq8F3KYlkWCWZGjRvlkVo8GyCruqaUeQO6PF6+HdHfsD3KDsYxmEkBUunaClad4e4wK89vUzcC7+4s7bY/teVyNNUOFlVtEyRUZ1QIqLySCIiD2BisdfTd2FIka4bsK39vFuAFM1NmbzgTSoOpxibt3KUi6G0hXpfBdN2+iubUFOGV3bHdex675+99d76hpFRw== 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=9sJD6ua6O32E8RjWOtBKJ9z55CqAqJdnd2jJXX1KfR8=; b=huwvSICR7cxb+e3HyP1ujxLZTv4uVOSQNm91jQ0vd10q2433Uf1jmdrhQv7DUP22AsmwCdfS3TzjIEG/MruN5u3L4yrmMc8whMvZgi5tzY/MboKK9c8i9FoUYMPCKD7ymUdSa7bbgIFTuCcCQwR3nBhbJHRzuz0Oid3ZqWY3oFIH/yYQVEFnbzOEuToXmGY6wGsh7e42Y1VmsYS+tpZIx6YNDoaiiF+bS7Y+43ZiTsys1JP3fprmpmH5sX2s7EaEqEBImFXRqHRXgqkDYkIocd/WuyyBN9CTWrdJhFtNe95jvpSiEFx4rfb0YuqDSZJRBS8foeaGoRAGHyLZlzScTQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; 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=9sJD6ua6O32E8RjWOtBKJ9z55CqAqJdnd2jJXX1KfR8=; b=Ni7j2zLbQgV0VhLtVM3151YdzfmaEIOA9w6L9Zcp0lywsjrpNOaFcggAoQ7GROiXjzVq0seDFGBxqm9rEKvouoea4sS2HYOSa4f8qNKEtq254/jKeVk5tSykfIj5vWm06/WaBRC0k6g02DcaiKtCgE6eu3hLcX6Ocg2xBDA/+z4= 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 PRAP251MB0443.EURP251.PROD.OUTLOOK.COM (2603:10a6:102:29f::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11; Thu, 17 Feb 2022 12:55:11 +0000 Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::1cba:3835:dd1e:63d3]) by DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::1cba:3835:dd1e:63d3%5]) with mapi id 15.20.4995.017; Thu, 17 Feb 2022 12:55:11 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Thu, 17 Feb 2022 13:55:04 +0100 Message-Id: <20220217125504.700745-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.30.2 X-ClientProxiedBy: GV3P280CA0106.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:8::21) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2b610aeb-3d0d-4478-fe17-08d9f214bb7f X-MS-TrafficTypeDiagnostic: PRAP251MB0443:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4afw6F1ytIyx3EBZfZeVN0ELHxu/MSiPijUMZsKqJhaaVjKf9+D1Yes3MpnTAvK1XZAgIQ2uI4/BPOtJSAhK5OA3Z9QTXaBeFBoOJFHvxnxxFWCFslaq9MPufT7anUStNHnCGHAEAfDnKjOXvpGxk0d9Xn2PPmLdwaqGDSxZ/4Rb8v193OnGcZThOz2RiqzrcJgCW6A3MlBYpbIkwZ8tkCN/feYpIk0p8A9yslv7oWXAst+gNBpPDfFbN1C2ij1p+Ptx9E6Q2zMMqgXGbwxtwyxccU/tWqTUrHWys5z+FmkgUekSViTc5SweJ9W4jt1z59Xvoia8f0DTg3gB5Gte3TL5LXFFi3LfWhcagJFU5DAtvVL614Rpk+aDrlSE19Zq8FdoF8gZgCDd7UtTD8qVfE31NIW9n7N+QY8OGmf9mOGqkE+E7SxYKMNEBjdX4YhLFEA9pszeNcnCXlzjOIvo1GdJVbYwUYOUHE3mx5Z+KQp9Cz2wreSSu/50BbOdfeBG/jmGd0Wxp/hsB+AUSASuWL6hkPCosaLKkwbK/Sc2EM1TSXufiRpbB2PDUPvTc1hqSvoGSarpmarRayDZs3gNbToffl1W1EdrS6oQYSMGdJVUSYbZfefxnwJpSX4d7URDV1XzvA8SC87pMYW66xtMnJL6Fst0XuwhmUVPoY5qUcFeqi5mSsBciN04XwdlqODVgLvbB4CXSf8q4SkmSabOXA== 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:(13230001)(136003)(376002)(396003)(366004)(346002)(39830400003)(6486002)(5660300002)(8936002)(1076003)(26005)(508600001)(83380400001)(66556008)(8676002)(66476007)(6666004)(6512007)(66946007)(36756003)(44832011)(316002)(6506007)(2906002)(186003)(38350700002)(2616005)(86362001)(6916009)(52116002)(38100700002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6oTnnzy1LdhHVNJxZRQO4o1I7mhWDEKlkGUaWOSbc4B/EYRCGHc5dfmOHg8G?= =?us-ascii?Q?Fy/T9joJRU9lvX/sQ4mFbnw9EiKMqAz2OPzGkQLedI8jSaa72CHTMamigXCB?= =?us-ascii?Q?6gpRQ3WmlZMADUeSyCspkbQ+Zv1Hp7BG2CB13NaDFfzHMsPqR5FPSTU9j9hK?= =?us-ascii?Q?1ai6eJ8RYVgnI53KHmRIs39lJW+TAmvicM7NUJ89SZWp68Uf47NsCdFjG4IA?= =?us-ascii?Q?YgKin6xsEIREXFoxdaJ+RuHkCIxbRs7ZtjwAP+0Kc8hdKMLCECtxAd3Nv5Kh?= =?us-ascii?Q?1h5fz+89PdFprcYaLToaRMg7ZA6KZjOJiLQAc8CfgGW2XrGuOR6tmtvMUUws?= =?us-ascii?Q?N88Xg/LBrPlXsG4JPZ/MzPuINpR3jbxxPhXy1sPoxyOmcb0GXK5kxjYoU49z?= =?us-ascii?Q?wR8NIM+Hjpt8fmfAXEMWZ60uQL69/M1vx8m5g3MZTxjF8/+ksEtA3bRrp/in?= =?us-ascii?Q?IWINecBhl5TvfPh5Hb95kOqvN4unYlJ8ioc79D6CdG1VMGVG2XxyhEkgl0c4?= =?us-ascii?Q?tzUt+bIjF3aF0Sq9D+VEU/mswwDcAxqIfNaGQbAGYXblExfpmq2fWCzMzRTy?= =?us-ascii?Q?65I09ISuSo3s+iGYrxDz7zBAVTHZ1G/pU4xAZq3e65HSjyw6sIJRpAXBGpKL?= =?us-ascii?Q?912zTny0656FGQ0oltJBWDo2ASnvERqekQ24hr8lYs/UMWe+utfjmCR/xIKv?= =?us-ascii?Q?rl/cZOLWP1shkIDg1Y7WN+5tDh86+b3O0Wb3K/GugE2fcDZzuynLVyn4LIx0?= =?us-ascii?Q?h0/G1LxjbIwS0MIOMcy9KZ3ldkE+pLBRB+xC+e3NJcu9YnuyCZ6Kre2cR7H7?= =?us-ascii?Q?w42vTzIYwUDdQe4bYj7QU82iNnme4+fO4zutDkcby+SbhWIXsa2w2hvhWVS/?= =?us-ascii?Q?m1sgm/1a4S0XjS0YKK/jZ1tQckF5vWqVZ4SeIikX4xfSfiS6gG44K1AQZ8Wc?= =?us-ascii?Q?HKJslz/uQgpGwA54q5vAlRgSJKmx8x8VipXxV2+iOVUwQ8u4wV6BAAMNUFep?= =?us-ascii?Q?5Txs/AmaamvxVLKr1s3G3e9bEijU1bh6Qp8Gibw3jQQKiyPIpdU9urXmaYFc?= =?us-ascii?Q?xg52//K/jr0nJDaouLycDQn6qOZCZn+3SIkgDItN3a/ahEzMtNLNiY9mXBn7?= =?us-ascii?Q?ULcWQ76mnfPZ+PZYFWMz+4+LN7VgNCVRvRuwWdccRYWShBb3Pg3kzDWBnftS?= =?us-ascii?Q?rq0XhTGid4ACBk/53Fc/HK94RelyYYGk/O5/W+LQwhS2NGORvT1BsBIosRkq?= =?us-ascii?Q?tbV04lpkGIPyMso4ogg9K8qcpUQaa5H6tUq1iQbTw89yl3RDU/MgJRkvVWZU?= =?us-ascii?Q?YCQY0Cp726Dxp214WRrXdmwdghjL9M9WoyL92GKi0ahWy1IXtOAdtiouezNg?= =?us-ascii?Q?mrFgZ1eJ823Ixde3yA7b/CxZQrDVKpOxJKq4hDCx+VgWnVjCQ6bFmHj4tqxE?= =?us-ascii?Q?PPrLMj5eZ0K/+pyuqK/80wtdQtE+SLAiFbOHDPyThTHF+O7V87e+cihnibDI?= =?us-ascii?Q?W7IoEcybO9vmXnMUk0RZAps5wj/H5GAnquSyEVB0hIq/bSfK0XwhJQx1NQCE?= =?us-ascii?Q?PexOrb1Xiw3I+jx1roH1ZE4wEmIYb7BweCuicaagV1eiIoyulyNiZ9bcvh3F?= =?us-ascii?Q?ESVZO9uOoGRAYmfdxPA262tRKkNjq/qDAwyiQHpJb3rlipA5nb7unMTgXX9T?= =?us-ascii?Q?pReVd79VCsqLD8COSsCZ6Buf3/c=3D?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2b610aeb-3d0d-4478-fe17-08d9f214bb7f X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2022 12:55:11.0662 (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: JYMa9YCfR3OPnOQYwPxtlLwh/7bWVVhGGoOZYZo5ot490uFdoINHs5xNsOGm0yw1Fo+BHIjhzmFrV5OLulfijStBK21llmZObUFkrFKa+00= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PRAP251MB0443 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-1.9 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] image-root-cpio: Move compression options into one menu. 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 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 * Clean cpio generation, drop separate in and make for gz. * Extend image-root-cpio.in with compression methods (raw, gz, zstd, xz, lzop). * Make compression a variable for the single makefile. * Make filename variable depending on compression method Signed-off-by: Christian Melki --- platforms/image-root-cpio-gz.in | 10 ------ platforms/image-root-cpio.in | 59 +++++++++++++++++++++++++++++++-- rules/image-root-cpio-gz.make | 38 --------------------- rules/image-root-cpio.make | 4 +-- 4 files changed, 59 insertions(+), 52 deletions(-) delete mode 100644 platforms/image-root-cpio-gz.in delete mode 100644 rules/image-root-cpio-gz.make diff --git a/platforms/image-root-cpio-gz.in b/platforms/image-root-cpio-gz.in deleted file mode 100644 index e1feb5f9b..000000000 --- a/platforms/image-root-cpio-gz.in +++ /dev/null @@ -1,10 +0,0 @@ -## SECTION=image - -config IMAGE_ROOT_CPIO_GZ - tristate - select HOST_GENIMAGE - select IMAGE_ROOT_TGZ - prompt "Generate images/root.cpio.gz" - help - Build the traditionally initrd RAM disk to be used - as initramfs by the kernel. diff --git a/platforms/image-root-cpio.in b/platforms/image-root-cpio.in index f5ee4c1d8..4811909c8 100644 --- a/platforms/image-root-cpio.in +++ b/platforms/image-root-cpio.in @@ -1,10 +1,65 @@ ## SECTION=image -config IMAGE_ROOT_CPIO +menuconfig IMAGE_ROOT_CPIO tristate select HOST_GENIMAGE select IMAGE_ROOT_TGZ - prompt "Generate images/root.cpio" + select HOST_ZSTD if IMAGE_ROOT_CPIO_ZSTD + select HOST_XZ if IMAGE_ROOT_CPIO_XZ + select HOST_LZOP if IMAGE_ROOT_CPIO_LZOP + prompt "Generate images/root.cpio " help Build the traditionally initrd RAM disk to be used as initramfs by the kernel. + +if IMAGE_ROOT_CPIO + +config IMAGE_ROOT_CPIO_RAW + bool + prompt "CPIO raw, no compression" + default y + help + No compression. + +config IMAGE_ROOT_CPIO_GZ + bool + prompt "CPIO gz compression" + help + Compress root.cpio with gz + +config IMAGE_ROOT_CPIO_ZSTD + bool + prompt "CPIO zstd compression" + help + Compress root.cpio with zstd + +config IMAGE_ROOT_CPIO_XZ + bool + prompt "CPIO xz compression" + help + Compress root.cpio with xz + +config IMAGE_ROOT_CPIO_LZOP + bool + prompt "CPIO lzop compression" + help + Compress root.cpio with lzop + +config IMAGE_ROOT_CPIO_COMPRESSION + string + default "" if IMAGE_ROOT_CPIO_RAW + default ".gz" if IMAGE_ROOT_CPIO_GZ + default ".zst" if IMAGE_ROOT_CPIO_ZSTD + default ".xz" if IMAGE_ROOT_CPIO_XZ + default ".lzo" if IMAGE_ROOT_CPIO_LZOP + +config IMAGE_ROOT_CPIO_COMPRESSION_UTIL + string + default "" if IMAGE_ROOT_CPIO_RAW + default "gzip" if IMAGE_ROOT_CPIO_GZ + default "zstd" if IMAGE_ROOT_CPIO_ZSTD + default "xz" if IMAGE_ROOT_CPIO_XZ + default "lzop" if IMAGE_ROOT_CPIO_LZOP + +endif + diff --git a/rules/image-root-cpio-gz.make b/rules/image-root-cpio-gz.make deleted file mode 100644 index 52a6a4bd9..000000000 --- a/rules/image-root-cpio-gz.make +++ /dev/null @@ -1,38 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2012 by Michael Olbrich -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -IMAGE_PACKAGES-$(PTXCONF_IMAGE_ROOT_CPIO_GZ) += image-root-cpio-gz - -# -# Paths and names -# -IMAGE_ROOT_CPIO_GZ := image-root-cpio-gz -IMAGE_ROOT_CPIO_GZ_DIR := $(BUILDDIR)/$(IMAGE_ROOT_CPIO_GZ) -IMAGE_ROOT_CPIO_GZ_IMAGE := $(IMAGEDIR)/root.cpio.gz -IMAGE_ROOT_CPIO_GZ_FILES := $(IMAGEDIR)/root.tgz -IMAGE_ROOT_CPIO_GZ_CONFIG := cpio.config - -# ---------------------------------------------------------------------------- -# Image -# ---------------------------------------------------------------------------- - -IMAGE_ROOT_CPIO_GZ_ENV := \ - FORMAT="newc" \ - COMPRESS=gzip - -ifdef PTXCONF_IMAGE_ROOT_CPIO_GZ -$(IMAGE_ROOT_CPIO_GZ_IMAGE): - @$(call targetinfo) - @$(call image/genimage, IMAGE_ROOT_CPIO_GZ) - @$(call finish) -endif - -# vim: syntax=make diff --git a/rules/image-root-cpio.make b/rules/image-root-cpio.make index ab6afdd42..4232983dd 100644 --- a/rules/image-root-cpio.make +++ b/rules/image-root-cpio.make @@ -16,7 +16,7 @@ IMAGE_PACKAGES-$(PTXCONF_IMAGE_ROOT_CPIO) += image-root-cpio # IMAGE_ROOT_CPIO := image-root-cpio IMAGE_ROOT_CPIO_DIR := $(BUILDDIR)/$(IMAGE_ROOT_CPIO) -IMAGE_ROOT_CPIO_IMAGE := $(IMAGEDIR)/root.cpio +IMAGE_ROOT_CPIO_IMAGE := $(IMAGEDIR)/root.cpio$(call remove_quotes, $(PTXCONF_IMAGE_ROOT_CPIO_COMPRESSION)) IMAGE_ROOT_CPIO_FILES := $(IMAGEDIR)/root.tgz IMAGE_ROOT_CPIO_CONFIG := cpio.config @@ -26,7 +26,7 @@ IMAGE_ROOT_CPIO_CONFIG := cpio.config IMAGE_ROOT_CPIO_ENV := \ FORMAT="newc" \ - COMPRESS= + COMPRESS=$(call remove_quotes, $(PTXCONF_IMAGE_ROOT_CPIO_COMPRESSION_UTIL)) ifdef PTXCONF_IMAGE_ROOT_CPIO $(IMAGE_ROOT_CPIO_IMAGE): -- 2.30.2 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de