Thanks, applied as 5878816ad51c7914d84f856254fbabbd9b2ba896. Michael
[sent from post-receive hook] On Fri, 11 Nov 2022 15:31:10 +0100, Ladislav Michl <oss-li...@triops.cz> wrote: > Signed-off-by: Ladislav Michl <la...@linux-mips.org> > Message-Id: <Y1btrsTd/Jau7naI@lenoch> > Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de> > > diff --git a/rules/ckermit.make b/rules/ckermit.make > index e983803c13d0..5a6373938b5d 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 8ae6fd7341da..70285310beee 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 8d2c7ffdb612..d8c0c1dc6f74 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 196d2a45cbd8..fc830dd1f1c7 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 eb9d704d2675..f761ebaed0dc 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 162ec491b0fe..06f3c8bd1850 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 f18ad84ee518..e6a9fb051bec 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 7dd209f61075..c6ecc085d6aa 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 d05fc7b7e60c..dcdd342d55de 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 1c6d67b17029..0213816e916b 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 e98191ef3385..489603383d5b 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
