From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 04 Jan 2023 13:12:30 +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 1pD2dD-001R18-1r for lore@lore.pengutronix.de; Wed, 04 Jan 2023 13:12:30 +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 1pD2dB-0002tT-Gc; Wed, 04 Jan 2023 13:12:29 +0100 Received: from mail-vi1eur05on2074.outbound.protection.outlook.com ([40.107.21.74] 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 1pD2cb-0002tK-6v for ptxdist@pengutronix.de; Wed, 04 Jan 2023 13:11:55 +0100 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SsA0lo6JhpAcgfPF92e9Q6HALGLETYiDZJSwkG13epIEFHXCe4G4VS9CgUphBZHu+S2jRmEXkEJnzSLMHgrLQOgiTJ+gOKfodA3ClokR3G/xl5dbtZRj3ZCvvSbqRJh87yi0WENyhuBiI5NyowWxs02sB8fvEyp5tnPMMHrvnyjBw3IBsZywgr3xYV0BxX5TTKgAe9Uu/O5ESfZ0UscMnNXYzqfzYWWOdiYE9E6c2q/G9Rq9Svl+SM0k2aLCT5BMFvyGYEPf+hkrMlfzS5OTx0Vhc+8LSEUE1NZ/V7I3awwTLpCzTLMgct7FNm7qrS+RK7g1wnll9C2Un9cGFX4a7A== 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=uJdgIyBDAX9F89djrenlL59bCOMrv+zIs21z5ZJ4k6s=; b=AptSirpzWB12wPwfa4ztGxLxXspZhNhIBp8cGakDRpJHs0gBoIdScXVW8//Ye64Hh3OEZvupjoavUZi+CVKfX8eyQVxLDqoYClx/M0KCQZypx5s9ezgtNZueFdG4jOl1n5R8+dwitAnaTZks14MJX1Pf65XrqsJRT7ZxkrpFlKLCF7hlaWNwXsIoFqyPctd5v8segIYctemyz0vr2Z015wRGhMuU7muHM/Z/8QHoBAWgOuDJnoFCKH2+F2OBdu7s6XOCqx7KIUgr1QtktpoZqWuHEzG9/dMBJSI4NsdWZunEzi01e/FEwpKZBhSZ4zvQu8NRS0DzUzW1Ufw+jkcFUw== 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=uJdgIyBDAX9F89djrenlL59bCOMrv+zIs21z5ZJ4k6s=; b=ORUdaVktVFQU1yYKLOpElh+ALOpk7PALVtfxWmHz+kU+1EeiXe08QyMixkIz+lR+Rr49GBow3MDBGU60YLYQ1gDOyKZ6WlNfL6GxL5soD0wQCKowmIfSJTm8G0s6pgJs+zbTwSs9EuLveLfZsbRLU5B6rEDVle070h71N0dLx74= 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 AS8P251MB0806.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:50a::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.19; Wed, 4 Jan 2023 12:11:49 +0000 Received: from DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::d8cf:bdbe:3526:aa50]) by DB9P251MB0618.EURP251.PROD.OUTLOOK.COM ([fe80::d8cf:bdbe:3526:aa50%5]) with mapi id 15.20.5944.019; Wed, 4 Jan 2023 12:11:49 +0000 From: Christian Melki To: ptxdist@pengutronix.de Date: Wed, 4 Jan 2023 13:11:42 +0100 Message-Id: <20230104121142.3065356-1-christian.melki@t2data.com> X-Mailer: git-send-email 2.34.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: GVX0EPF000013D5.SWEP280.PROD.OUTLOOK.COM (2603:10a6:144:1::d) To DB9P251MB0618.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:334::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB9P251MB0618:EE_|AS8P251MB0806:EE_ X-MS-Office365-Filtering-Correlation-Id: c5725291-9925-45a9-eadf-08daee4cdb96 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /IkV/XQqa/9hH2DjQtbGHpgdah7L+F0u7BhLKlhQ+Qqex9RcRjIUtFS5Be//Qp0aRNBVxlBPylAUP1mc9ZcFR+XjhNTk2SyuA+DKlISlJb7XeWOTacmi/FRdxxlSDZmtGacMEIEL+1lL2Xir/FlwvbXL7P0VVL29IMm+mZ9lE84ppPEQWRij8mTDaZ0XhGjJC3tjN99KrJ0dJvWtZ557a4Rspo8gwWQtmlkW7lE6rsjnDW7MNcBmP1UvGfwe79OFlD96UnrrGEck7qo9BioOJP640CkfbruiJ3QHhsRfWi6sGT5vsnX/0O/l6PT3neRB+RJamtEwCFz7TqjIBn9AdRg/3iOEcQbz99OdKRdVhwLob4Fu2aAJTZknCGRDwomUyBoDxSCdlP6ggMF1qRAJsp/7MCviJssHQx5GdLBZpomVWE3CEin2iEN3rmsBji8AjpnB52sjjXgJi/jOIfY2csMp+bL2GsmWAcSc+kkksp9XCVBz53CiULZUQhCYhHGk0H8VG7shBjVffe005TQ5oKLp7hXN5Uh+i/yc1arcJ4F5gb7iWuYIZpfXZgmHqyT/+FA38vWozw1mjO9wFnioA3bTBvRaPUscpf9earvtTnmD7zDEihoIxoqhBHUio6y54QA8noC+iat/j7pdAE/laLKvf1MFQSOHWCy6MXUuZVDBimSq86M2eGm6tCVbJdwtIvhza+sLUxSW8rRE1Y+9hDwyweckMPOcazCCyY3W8vc= 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:(13230022)(346002)(39830400003)(366004)(376002)(136003)(396003)(451199015)(83380400001)(5660300002)(8936002)(2906002)(44832011)(41300700001)(86362001)(36756003)(38350700002)(26005)(186003)(6916009)(6512007)(6666004)(316002)(966005)(52116002)(6506007)(38100700002)(6486002)(2616005)(8676002)(1076003)(478600001)(66556008)(66946007)(66476007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?JBO4szPTNk0+meT1flqNxgNLmCO0ZoS1PpHRCjJaLB1jaHOUWPPybz4CKQtX?= =?us-ascii?Q?tgzUA+2gqToChOxAUu72Lqv1/vCWHKoCy96IZa41PCuaLDAZ73oIwtBN4CPq?= =?us-ascii?Q?gAPda1tThiJ+RitqCZ2xMpaG1QqXlvP0Wv/Id26TziWgAbAsZNWKdMEsDmqn?= =?us-ascii?Q?tI5LeqT+V6k+TozqlG0jof/EbsGHdGwZ3vJZcHIPwm36ka8NBw2ehPPqe2Wf?= =?us-ascii?Q?bL5wHHM1VjqWOXPYOIHefLhhFe9EZaMnWfgvCuSJNWeMcR2AVbYVbTGLxzxk?= =?us-ascii?Q?AXV/QV/khNEbESg5xKRB4Y9VyiCMCam4uUu8IBbok0liG1jRkuDOIf5r/u7M?= =?us-ascii?Q?QYojaqutg2O5lSg90qoTRFWb2IyYB1AZiQhl73JUOyqQl0GqhTA79g1fCaGM?= =?us-ascii?Q?+yWdPdfwioCWpC3j+ErHHGjyultb9nMYO8IN0V5h1QMQVLOecAij/bOn5Y5f?= =?us-ascii?Q?7N6JfYQmFReyAqWacSA4RkLuem2qQs9klPwjUl8eiQB6jpduvBI6bW60e9UT?= =?us-ascii?Q?HV89OG+SBOpqBSf9HeFmh/J/HiqowdoyPyWP8zrjSiGbefiCAcw6MHqJHp1D?= =?us-ascii?Q?hlGS4pNG+zWP3J8BNGBxnQVaA63trCuFZ5hzlPvvddiQu2Hx5XbWX5e6BkcV?= =?us-ascii?Q?JPObTEw872OpSEeS2ABlQ6qQGIZe3M3pfrl03twj/PHEVU6J9hjn9tbmgY/U?= =?us-ascii?Q?0R/bEfITZjOH8XC+34mk1s3ClNCfdhEayw0bUHfmAN1zDtii2imlVLnCjtTw?= =?us-ascii?Q?70+Lm5a3zyCJ3lZffJ7etL9bkXqHxT0qJIG5VEEe3Na/R8ILqWZJt03avE2u?= =?us-ascii?Q?NDUZO1jrYgZ/huSpgpUAL7LxA6fRHppDknHFhUU8iGOAqzh2158a5BnsaE9M?= =?us-ascii?Q?FeGim7nFkVGU5PAqT5zd1jjq+5/7BTTLdzuu7tI2cGIj8HIniLVLoRTS6QQW?= =?us-ascii?Q?ZOgU0rCQHN6Xz0EQl7vrewUAqCVXxqTHPSFubtIOdQ5FiJ3F8dby4/lzlgfv?= =?us-ascii?Q?eIlhpkK7GRQ1pn1bSaGzroYw5uBxALpVVWuK5NEIwXIO0bZ1CuEs+Tnf4zKm?= =?us-ascii?Q?x0Xmn4kK6ZMzY5KV3r8fZ572Kxmkr+5ofGbeEkCtNp30vIEiDBxO95D1aUCT?= =?us-ascii?Q?BWsqYPMyzORUbH77jiAyAe8elyIgAlqEQmsTwQbc1XeA53p/0m8J8GP0IOTY?= =?us-ascii?Q?rzIK2ld9vZF5mkWlVh5hjcwgdUGYB/6TnGlZv1fe16jTevh/4/tiyF6ttENj?= =?us-ascii?Q?Xub9ZKD+PtAPphNmGMC0I/efniLDLoE+CEPPFmK4YrlUN/BK1ib7Bb6hz3cm?= =?us-ascii?Q?jwc8oo8Js+3vDmY7Y+eY5beIAf+9o8dx+kgumjFjHVe/i1dmzSlvWSxcX5sC?= =?us-ascii?Q?keEuLE0Rk8uFGF6tW+y6n92KyAiqTDSXQzBmEUubWv5mv8Y2EEsniG4QteYn?= =?us-ascii?Q?5lNkMs2aHnkWyN/dQYBC3LrutPkhuxly1nYbr/X17N2k6J+GJmWrcOe4AH1V?= =?us-ascii?Q?lpEtJE0vkbAjxvY6Z1GlxMYED3v+pdgDt6MOqYMnls4ABmTHZVPQoBh00pth?= =?us-ascii?Q?x+4cqVZD26dFxcX6I2CvXDozbdIAR2XrDj/mBqnHXh3SdP7Q8vQyCXgTSJ/T?= =?us-ascii?Q?tw=3D=3D?= X-OriginatorOrg: t2data.com X-MS-Exchange-CrossTenant-Network-Message-Id: c5725291-9925-45a9-eadf-08daee4cdb96 X-MS-Exchange-CrossTenant-AuthSource: DB9P251MB0618.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Jan 2023 12:11:49.6622 (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: v23wVIT2duFhBTb3gJfe0s1CSWQHenXl5JI9kZqtmeSK3IKnIKgdOnRacE3Ml8YrWMnWnevZUJHooxTdJ3FnuK8/qMh+7dzc/gSb+sK/uj0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P251MB0806 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] tree: Version bump. 1.6.0 -> 2.1.0 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.ext.pengutronix.de); SAEximRunCond expanded to false So, 10+ years since last update. A few releases has been made. https://mama.indstate.edu/users/ice/tree/changes.html * Add patch to try to cleanup the variable handling in makefile. * Fix prefix. * Add busybox tree collision handling. Signed-off-by: Christian Melki --- ...ect-prefix-handling-and-installation.patch | 76 +++++++++++++++++++ patches/tree-2.1.0/series | 5 ++ rules/tree.in | 4 + rules/tree.make | 7 +- 4 files changed, 89 insertions(+), 3 deletions(-) create mode 100644 patches/tree-2.1.0/0100-Makefile-Correct-prefix-handling-and-installation.patch create mode 100644 patches/tree-2.1.0/series diff --git a/patches/tree-2.1.0/0100-Makefile-Correct-prefix-handling-and-installation.patch b/patches/tree-2.1.0/0100-Makefile-Correct-prefix-handling-and-installation.patch new file mode 100644 index 000000000..60fe88f94 --- /dev/null +++ b/patches/tree-2.1.0/0100-Makefile-Correct-prefix-handling-and-installation.patch @@ -0,0 +1,76 @@ +From: Christian Melki +Date: Wed, 4 Jan 2023 11:22:17 +0100 +Subject: [PATCH] Makefile: Correct prefix handling and installation + +Curly braces won't work. +Just minimal effort variable handling cleaning. + +Signed-off-by: Christian Melki +--- + Makefile | 19 ++++++++----------- + 1 file changed, 8 insertions(+), 11 deletions(-) + +diff --git a/Makefile b/Makefile +index 752e55002c59..2a8e2a62b068 100644 +--- a/Makefile ++++ b/Makefile +@@ -23,10 +23,9 @@ INSTALL=install + + VERSION=2.1.0 + TREE_DEST=tree +-DESTDIR=${PREFIX}/bin + MAN=tree.1 +-# Probably needs to be ${PREFIX}/share/man for most systems now +-MANDIR=${PREFIX}/man ++BINDIR=$(PREFIX)/bin ++MANDIR=$(PREFIX)/man/man1 + OBJS=tree.o list.o hash.o color.o file.o filter.o info.o unix.o xml.o json.o html.o strverscmp.o + + # Uncomment options below for your particular OS: +@@ -51,7 +50,6 @@ CFLAGS+=-O3 -std=c11 -pedantic -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=6 + #CC=cc + #CFLAGS+=-xO0 -v + #LDFLAGS+= +-#MANDIR=${prefix}/share/man + + # Uncomment for Cygwin: + #CFLAGS+=-O2 -Wall -fomit-frame-pointer +@@ -63,22 +61,20 @@ CFLAGS+=-O3 -std=c11 -pedantic -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=6 + #CC=cc + #CFLAGS+=-O2 -Wall -fomit-frame-pointer -no-cpp-precomp + #LDFLAGS+= +-#MANDIR=${PREFIX}/share/man + + # Uncomment for HP/UX: +-#prefix=/opt ++#PREFIX=/opt + #CC=cc + # manpage of mbsrtowcs() requires C99 and the two defines + #CFLAGS+=+w -D_XOPEN_SOURCE=500 -D_POSIX_C_SOURCE=200112 -AC99 + #LDFLAGS+= +-#MANDIR=${PREFIX}/share/man + + # Uncomment for OS/2: + #CFLAGS+=-02 -Wall -fomit-frame-pointer -Zomf -Zsmall-conv + #LDFLAGS+=-s -Zomf -Zsmall-conv + + # Uncomment for HP NonStop: +-#prefix = /opt ++#PREFIX=/opt + #CC=c89 + #CFLAGS+=-Wextensions -WIEEE_float -g -Wnowarn=1506 -D_XOPEN_SOURCE_EXTENDED=1 \ + # -Wallow_cplusplus_comments +@@ -104,9 +100,10 @@ clean: + + install: tree + $(INSTALL) -d $(DESTDIR) +- $(INSTALL) -d $(MANDIR)/man1 +- $(INSTALL) $(TREE_DEST) $(DESTDIR)/$(TREE_DEST); \ +- $(INSTALL) -m 644 doc/$(MAN) $(MANDIR)/man1/$(MAN) ++ $(INSTALL) -d $(DESTDIR)$(BINDIR) ++ $(INSTALL) -d $(DESTDIR)$(MANDIR) ++ $(INSTALL) $(TREE_DEST) $(DESTDIR)$(BINDIR)/$(TREE_DEST) ++ $(INSTALL) -m 644 doc/$(MAN) $(DESTDIR)$(MANDIR)/$(MAN) + + distclean: + rm -f *.o *~ diff --git a/patches/tree-2.1.0/series b/patches/tree-2.1.0/series new file mode 100644 index 000000000..4096d016c --- /dev/null +++ b/patches/tree-2.1.0/series @@ -0,0 +1,5 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +#tag:ptx --start-number 100 +0100-Makefile-Correct-prefix-handling-and-installation.patch +# c6afa65ff4fa8096eb1f7c44d7fc7341 - git-ptx-patches magic diff --git a/rules/tree.in b/rules/tree.in index d513f04c9..4a03f1bd0 100644 --- a/rules/tree.in +++ b/rules/tree.in @@ -4,6 +4,10 @@ config TREE tristate prompt "tree" select GCCLIBS_GCC_S + depends on !BUSYBOX_TREE || ALLYES help A directory listing program displaying a depth indented list of files. + +comment "BusyBox' tree is selected!" + depends on BUSYBOX_TREE diff --git a/rules/tree.make b/rules/tree.make index 1f1512f21..feadeaf06 100644 --- a/rules/tree.make +++ b/rules/tree.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_TREE) += tree # # Paths and names # -TREE_VERSION := 1.6.0 -TREE_MD5 := 04e967a3f4108d50cde3b4b0e89e970a +TREE_VERSION := 2.1.0 +TREE_MD5 := 50aa5cdb28df6340ef67a3a3ec953ffc TREE := tree-$(TREE_VERSION) TREE_SUFFIX := tgz TREE_URL := http://mama.indstate.edu/users/ice/tree/src/$(TREE).$(TREE_SUFFIX) @@ -36,7 +36,8 @@ TREE_MAKE_OPT := \ $(CROSS_ENV_AS) TREE_INSTALL_OPT := \ - prefix=$(TREE_PKGDIR)/usr install + PREFIX=/usr \ + install # ---------------------------------------------------------------------------- # Target-Install -- 2.34.1