From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 28 Sep 2022 16:30:13 +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 1odY4j-00HPbl-Qm for lore@lore.pengutronix.de; Wed, 28 Sep 2022 16:30:13 +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 1odY4i-0002HV-FL; Wed, 28 Sep 2022 16:30:12 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1odY3f-00007F-L4; Wed, 28 Sep 2022 16:29:07 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1odY3g-003R4z-Cj; Wed, 28 Sep 2022 16:29:06 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1odY3d-00EwXc-SI; Wed, 28 Sep 2022 16:29:05 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Wed, 28 Sep 2022 16:29:05 +0200 Message-Id: <20220928142905.3561581-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220923072430.652471-1-christian.melki@t2data.com> References: <20220923072430.652471-1-christian.melki@t2data.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] crda: Version bump. crda 4.14 -> 4.15. regdb 2022.06.06 -> 2022.08.12. 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 Cc: Christian Melki 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 Thanks, applied as 2e94022092149d56ffe9b009f6fa98413446f62b. Michael [sent from post-receive hook] On Wed, 28 Sep 2022 16:29:05 +0200, Christian Melki wrote: > Very minor fixes. crda is just a release tag on the latest commit, > which is a couple of years already. > > * Forward patches. Minor changes to make them apply. > > Signed-off-by: Christian Melki > Message-Id: <20220923072430.652471-1-christian.melki@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/patches/crda-4.14/0001-fix-linking-libreg.patch b/patches/crda-4.15/0001-fix-linking-libreg.patch > similarity index 92% > rename from patches/crda-4.14/0001-fix-linking-libreg.patch > rename to patches/crda-4.15/0001-fix-linking-libreg.patch > index 8eae90bd3dcb..6b566ba042ac 100644 > --- a/patches/crda-4.14/0001-fix-linking-libreg.patch > +++ b/patches/crda-4.15/0001-fix-linking-libreg.patch > @@ -9,7 +9,7 @@ Signed-off-by: Marc Kleine-Budde > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/Makefile b/Makefile > -index a3ead30371c9..2f485724c3be 100644 > +index 6ca26f341dfa..832399dea8db 100644 > --- a/Makefile > +++ b/Makefile > @@ -30,7 +30,7 @@ CFLAGS += -std=gnu99 -Wall -Werror -pedantic > @@ -39,10 +39,10 @@ index a3ead30371c9..2f485724c3be 100644 > > @@ -116,7 +116,7 @@ keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) > > - $(LIBREG): regdb.h reglib.h reglib.c > + $(LIBREG): reglib.c regdb.h reglib.h > $(NQ) ' CC ' $@ > -- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ > -+ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $^ $(LIBREGLIBS) > +- $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $< > ++ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -shared -Wl,-soname,$(LIBREG) $< $(LIBREGLIBS) > > install-libreg-headers: > $(NQ) ' INSTALL libreg-headers' > diff --git a/patches/crda-4.14/0002-Do-not-run-ldconfig-if-DESTDIR-is-set.patch b/patches/crda-4.15/0002-Do-not-run-ldconfig-if-DESTDIR-is-set.patch > similarity index 83% > rename from patches/crda-4.14/0002-Do-not-run-ldconfig-if-DESTDIR-is-set.patch > rename to patches/crda-4.15/0002-Do-not-run-ldconfig-if-DESTDIR-is-set.patch > index fac3468923d7..8f40e0a89921 100644 > --- a/patches/crda-4.14/0002-Do-not-run-ldconfig-if-DESTDIR-is-set.patch > +++ b/patches/crda-4.15/0002-Do-not-run-ldconfig-if-DESTDIR-is-set.patch > @@ -8,13 +8,13 @@ Signed-off-by: Michael Olbrich > 1 file changed, 2 insertions(+) > > diff --git a/Makefile b/Makefile > -index 2f485724c3be..b74d3b544bd9 100644 > +index 832399dea8db..4ba2ed5aadd8 100644 > --- a/Makefile > +++ b/Makefile > @@ -127,7 +127,9 @@ install-libreg: > $(NQ) ' INSTALL libreg' > $(Q)mkdir -p $(DESTDIR)/$(LIBDIR) > - $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/ > + $(Q)$(INSTALL) -m 644 $(LIBREG) $(DESTDIR)/$(LIBDIR)/ > +ifndef DESTDIR > $(Q)ldconfig > +endif > diff --git a/patches/crda-4.14/0003-Allow-build-without-embedding-pubkey-data-into-crda-.patch b/patches/crda-4.15/0003-Allow-build-without-embedding-pubkey-data-into-crda-.patch > similarity index 95% > rename from patches/crda-4.14/0003-Allow-build-without-embedding-pubkey-data-into-crda-.patch > rename to patches/crda-4.15/0003-Allow-build-without-embedding-pubkey-data-into-crda-.patch > index 5a55618e6a64..a5b9fb9f331f 100644 > --- a/patches/crda-4.14/0003-Allow-build-without-embedding-pubkey-data-into-crda-.patch > +++ b/patches/crda-4.15/0003-Allow-build-without-embedding-pubkey-data-into-crda-.patch > @@ -10,7 +10,7 @@ Signed-off-by: Michael Olbrich > 2 files changed, 9 insertions(+), 2 deletions(-) > > diff --git a/Makefile b/Makefile > -index b74d3b544bd9..9ce318484001 100644 > +index 4ba2ed5aadd8..8f45630296d7 100644 > --- a/Makefile > +++ b/Makefile > @@ -42,7 +42,12 @@ ifeq ($(USE_OPENSSL),1) > @@ -27,7 +27,7 @@ index b74d3b544bd9..9ce318484001 100644 > else > CFLAGS += -DUSE_GCRYPT > diff --git a/reglib.c b/reglib.c > -index e00e9b8d4b44..87691022f9e7 100644 > +index 4dee40151bd6..6f1edec4e154 100644 > --- a/reglib.c > +++ b/reglib.c > @@ -30,7 +30,7 @@ > diff --git a/patches/crda-4.14/0004-udev-Fix-rule-for-initial-setup.patch b/patches/crda-4.15/0004-udev-Fix-rule-for-initial-setup.patch > similarity index 100% > rename from patches/crda-4.14/0004-udev-Fix-rule-for-initial-setup.patch > rename to patches/crda-4.15/0004-udev-Fix-rule-for-initial-setup.patch > diff --git a/patches/crda-4.14/series b/patches/crda-4.15/series > similarity index 100% > rename from patches/crda-4.14/series > rename to patches/crda-4.15/series > diff --git a/rules/crda.make b/rules/crda.make > index 6a6aeacb85a9..e9c91a68ee01 100644 > --- a/rules/crda.make > +++ b/rules/crda.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_CRDA) += crda > # > # Paths and names > # > -CRDA_VERSION := 4.14 > -CRDA_MD5 := cac7ba8de3e2e6aa46918e0c76df7d67 > +CRDA_VERSION := 4.15 > +CRDA_MD5 := 30797103dfaae807b6ece1a695518dc1 > CRDA := crda-$(CRDA_VERSION) > CRDA_SUFFIX := tar.gz > CRDA_URL := https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/crda.git/snapshot/$(CRDA).$(CRDA_SUFFIX) > @@ -26,8 +26,8 @@ CRDA_LICENSE_FILES := \ > file://LICENSE;md5=ef8b69b43141352d821fd66b64ff0ee7 \ > file://copyleft-next-0.3.0;md5=8743a2c359037d4d329a31e79eabeffe > > -CRDA_REGDB_VERSION := 2022.06.06 > -CRDA_REGDB_MD5 := 49b1309ed4fb507eec382faf7564d235 > +CRDA_REGDB_VERSION := 2022.08.12 > +CRDA_REGDB_MD5 := 29447e6d5e9dc268bf229fd98bfaf958 > CRDA_REGDB := wireless-regdb-$(CRDA_REGDB_VERSION) > CRDA_REGDB_SUFFIX := tar.gz > CRDA_REGDB_URL := \