From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 24 Oct 2022 21:55:37 +0200 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 1on3Xt-00188l-BQ for lore@lore.pengutronix.de; Mon, 24 Oct 2022 21:55:37 +0200 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 1on3Xs-00015v-Kb; Mon, 24 Oct 2022 21:55:36 +0200 Received: from h2.cmg2.smtp.forpsi.com ([81.2.195.189]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1on3Xl-00014L-2K for ptxdist@pengutronix.de; Mon, 24 Oct 2022 21:55:29 +0200 Received: from lenoch ([91.218.190.200]) by cmgsmtp with ESMTPSA id n3XioEkjGv5uIn3Xko6fXe; Mon, 24 Oct 2022 21:55:28 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=triops.cz; s=f2019; t=1666641328; bh=U0PQIPaaCSY8cwunHG2boyn4MJecLpjA8YR/T6lvguI=; h=Date:From:To:Subject:Message-ID:MIME-Version:Content-Type; b=HgwJDC3IyQxon8vwWlXRyafTTt4729WmXYi4kj9xGNgDx/0hSJnmMhA2bH8SBt4gr vIilap9XqzFUSBNcmPOmY+VsN1Dq2f/23HiKY2WJ1AqO+b5siSaaPBylHjUbqXq8li RjIzwYebtMcqWFGhCPvIbNB7SyDaSCVe1QekLzlfC1Re1UCTnTkn8+G+F6+oGNFAo/ wW5sdr4xw/BlMNR22xrxmgmwBse1ocPlI5CKE5G8acvIoqxw6O9QI1JZ37zNh7RuDv 3XoKbCFlX67rf5oE++HSGCFhUAa+0u6yteSj2wHjJKqizR8jjFsyD+4DpndNjcjN/M bnYr/oiWs2J4w== Date: Mon, 24 Oct 2022 21:55:26 +0200 From: Ladislav Michl To: ptxdist@pengutronix.de Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-CMAE-Envelope: MS4wfOHqJeZ6GUe8decZGNGrzpJnLFyBkSUlVir5bTzvzDmT7XQhOeMLRx2/vcrou22eecAJn/ftxtCF4uY3OrNYt/8yKeq6+nB47Bb14wTkdD3DsBOV/Qv2 XCANvuCqNJxStV03jEL09n1aPHSbhqjC2lBHtDR06DjtMh+aTDqOsxoZ 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,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH v2] rules: Replace deprecated _MAKEVARS 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 From: Ladislav Michl Signed-off-by: Ladislav Michl --- CHANGES: -v2: dropped from patch: - module-init-tools: removed by separate patch - host-libaio: only mysql needs this and it is in staging other packages compile tested and evetually fixed rules/ckermit.make | 10 +++++++++- rules/etherwake.make | 8 +++++++- rules/gdb.make | 3 ++- rules/killproc.make | 11 +++++++---- rules/libcgi.make | 2 +- rules/liblockfile.make | 3 ++- rules/lpc21isp.make | 2 +- rules/netcat.make | 5 ++--- rules/pcmciautils.make | 6 +++++- rules/pv.make | 2 +- rules/wireless.make | 11 ++++++----- 11 files changed, 43 insertions(+), 20 deletions(-) diff --git a/rules/ckermit.make b/rules/ckermit.make index e983803c1..5a6373938 100644 --- a/rules/ckermit.make +++ b/rules/ckermit.make @@ -35,7 +35,7 @@ CKERMIT_CONF_TOOL := NO # Compile # ---------------------------------------------------------------------------- -CKERMIT_MAKEVARS := \ +CKERMIT_MAKE_OPT := \ xermit \ KTARGET=linuxa \ prefix=/usr \ @@ -46,6 +46,14 @@ CKERMIT_MAKEVARS := \ LNKFLAGS='$(CROSS_LDFLAGS)' \ LIBS='-lncurses -lutil -lresolv -lcrypt -lm' +# ---------------------------------------------------------------------------- +# Install +# ---------------------------------------------------------------------------- + +CKERMIT_INSTALL_OPT := \ + prefix=/usr \ + install + # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- diff --git a/rules/etherwake.make b/rules/etherwake.make index 8ae6fd734..70285310b 100644 --- a/rules/etherwake.make +++ b/rules/etherwake.make @@ -29,7 +29,13 @@ ETHERWAKE_LICENSE := GPL # Prepare # ---------------------------------------------------------------------------- -ETHERWAKE_MAKEVARS := CC=$(CROSS_CC) +ETHERWAKE_CONF_TOOL := NO + +# ---------------------------------------------------------------------------- +# Compile +# ---------------------------------------------------------------------------- + +ETHERWAKE_MAKE_OPT := CC=$(CROSS_CC) # ---------------------------------------------------------------------------- # Target-Install diff --git a/rules/gdb.make b/rules/gdb.make index 8d2c7ffdb..d8c0c1dc6 100644 --- a/rules/gdb.make +++ b/rules/gdb.make @@ -54,12 +54,13 @@ GDB_CONF_ENV := \ host_configargs='$(GDB_CONF_OPT_HOST)' ifndef PTXCONF_GDB_SHARED -GDB_MAKEVARS := LDFLAGS=-static +GDB_MAKE_OPT := LDFLAGS=-static endif # # autoconf # +GDB_CONF_TOOL := autoconf GDB_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ --target=$(PTXCONF_GNU_TARGET) \ diff --git a/rules/killproc.make b/rules/killproc.make index 196d2a45c..fc830dd1f 100644 --- a/rules/killproc.make +++ b/rules/killproc.make @@ -25,14 +25,17 @@ KILLPROC_DIR := $(BUILDDIR)/$(KILLPROC) KILLPROC_LICENSE := GPL-2.0-only # ---------------------------------------------------------------------------- -# Prepare +# Prepare + Compile + Install # ---------------------------------------------------------------------------- -KILLPROC_MAKEVARS := \ - CC=$(CROSS_CC) \ +KILLPROC_CONF_TOOL := NO +KILLPROC_MAKE_OPT := \ + CC=$(CROSS_CC) +KILLPROC_INSTALL_OPT := \ SBINDIR=$(KILLPROC_PKGDIR)/usr/sbin \ UBINDIR=$(KILLPROC_PKGDIR)/usr/bin \ - INSTBINFLAGS="-m 0755" + INSTBINFLAGS="-m 0755" \ + install # ---------------------------------------------------------------------------- # Target-Install diff --git a/rules/libcgi.make b/rules/libcgi.make index eb9d704d2..f761ebaed 100644 --- a/rules/libcgi.make +++ b/rules/libcgi.make @@ -34,7 +34,7 @@ LIBCGI_LICENSE := LGPL-2.1-only LIBCGI_CONF_TOOL := autoconf LIBCGI_CONF_OPT := $(CROSS_AUTOCONF_USR) -LIBCGI_MAKEVARS := $(CROSS_ENV_CC) $(CROSS_ENV_AR) +LIBCGI_MAKE_OPT := $(CROSS_ENV_CC) $(CROSS_ENV_AR) # ---------------------------------------------------------------------------- # Target-Install diff --git a/rules/liblockfile.make b/rules/liblockfile.make index 162ec491b..06f3c8bd1 100644 --- a/rules/liblockfile.make +++ b/rules/liblockfile.make @@ -30,7 +30,8 @@ LIBLOCKFILE_LICENSE_FILES := file://COPYRIGHT;md5=35127b30003a121544b5d13a2ac868 # Prepare # ---------------------------------------------------------------------------- -LIBLOCKFILE_MAKEVARS := ROOT=$(PKGDIR)/$(LIBLOCKFILE) $(CROSS_ENV_AR) +LIBLOCKFILE_MAKE_OPT := $(CROSS_ENV_AR) +LIBLOCKFILE_INSTALL_OPT := ROOT=$(PKGDIR)/$(LIBLOCKFILE) install # # autoconf diff --git a/rules/lpc21isp.make b/rules/lpc21isp.make index f18ad84ee..e6a9fb051 100644 --- a/rules/lpc21isp.make +++ b/rules/lpc21isp.make @@ -30,7 +30,7 @@ LPC21ISP_LICENSE := GPL-3.0-or-later LPC21ISP_CONF_TOOL := NO LPC21ISP_MAKE_ENV := $(CROSS_ENV) -LPC21ISP_MAKEVARS := $(CROSS_ENV) +LPC21ISP_MAKE_OPT := CC=$(CROSS_CC) # ---------------------------------------------------------------------------- # Install diff --git a/rules/netcat.make b/rules/netcat.make index 7dd209f61..c6ecc085d 100644 --- a/rules/netcat.make +++ b/rules/netcat.make @@ -28,9 +28,8 @@ NETCAT_LICENSE := BSD # Prepare # ---------------------------------------------------------------------------- -NETCAT_CONF_TOOL := NO -NETCAT_MAKEVARS := \ - $(CROSS_ENV) +NETCAT_CONF_TOOL := NO +NETCAT_MAKE_ENV := $(CROSS_ENV) # ---------------------------------------------------------------------------- # Install diff --git a/rules/pcmciautils.make b/rules/pcmciautils.make index d05fc7b7e..dcdd342d5 100644 --- a/rules/pcmciautils.make +++ b/rules/pcmciautils.make @@ -32,7 +32,7 @@ PCMCIAUTILS_MAKE_ENV := \ $(CROSS_ENV_CPPFLAGS) \ $(CROSS_ENV_LDFLAGS) -PCMCIAUTILS_MAKEVARS := \ +PCMCIAUTILS_MAKE_OPT := \ prefix=/usr \ mandir=/usr/share/man \ CROSS=$(COMPILER_PREFIX) \ @@ -40,6 +40,10 @@ PCMCIAUTILS_MAKEVARS := \ STRIP=echo \ $(call ptx/ifdef, PTXCONF_PCMCIAUTILS_STARTUP, STARTUP=true, STARTUP=false) +PCMCIAUTILS_INSTALL_OPT := \ + $(PCMCIAUTILS_MAKE_OPT) \ + install + PCMCIAUTILS_MAKE_PAR := NO $(STATEDIR)/pcmciautils.prepare: diff --git a/rules/pv.make b/rules/pv.make index 1c6d67b17..0213816e9 100644 --- a/rules/pv.make +++ b/rules/pv.make @@ -26,7 +26,7 @@ PV_DIR := $(BUILDDIR)/$(PV) # Prepare # ---------------------------------------------------------------------------- -PV_MAKEVARS := $(CROSS_ENV_LD) +PV_MAKE_OPT := $(CROSS_ENV_LD) # # autoconf diff --git a/rules/wireless.make b/rules/wireless.make index e98191ef3..489603383 100644 --- a/rules/wireless.make +++ b/rules/wireless.make @@ -29,6 +29,8 @@ WIRELESS_LICENSE := GPL-2.0-only # Prepare # ---------------------------------------------------------------------------- +WIRELESS_CONF_TOOL := NO + $(STATEDIR)/wireless.prepare: @$(call targetinfo) ifdef PTXCONF_WIRELESS_SHARED @@ -42,7 +44,7 @@ endif # Compile # ---------------------------------------------------------------------------- -WIRELESS_MAKEVARS := \ +WIRELESS_MAKE_OPT := \ $(CROSS_ENV_CC) \ PREFIX=/usr @@ -50,10 +52,9 @@ WIRELESS_MAKEVARS := \ # Install # ---------------------------------------------------------------------------- -$(STATEDIR)/wireless.install: - @$(call targetinfo) - @$(call world/install, WIRELESS) - @$(call touch) +WIRELESS_INSTALL_OPT := \ + PREFIX=/usr \ + install # ---------------------------------------------------------------------------- # Target-Install -- 2.32.0