[v2] rtc-tools: Update to 2022.02

Message ID 20220216171002.2338962-1-festevam@gmail.com
State New
Headers show
Series [v2] rtc-tools: Update to 2022.02 | expand

Commit Message

Fabio Estevam Feb. 16, 2022, 5:10 p.m. UTC
From: Fabio Estevam <festevam@denx.de>

The patch that adds the rtc-tools Makefile has been accepted
upstream, so update to the latest 2022.02 version and remove the
local Makefile patch.

Also, rename the recipe to reflect the new version.

Signed-off-by: Fabio Estevam <festevam@denx.de>
---
Changes since v1:
- Use the 2022.02 tag (Peter)

 .../0001-rtc-tools-Add-a-Makefile.patch       | 39 -------------------
 ...tc-tools_1.0.0.bb => rtc-tools_2022.02.bb} |  6 +--
 2 files changed, 2 insertions(+), 43 deletions(-)
 delete mode 100644 meta-oe/recipes-support/rtc-tools/rtc-tools/0001-rtc-tools-Add-a-Makefile.patch
 rename meta-oe/recipes-support/rtc-tools/{rtc-tools_1.0.0.bb => rtc-tools_2022.02.bb} (64%)

Comments

Fabio Estevam Feb. 16, 2022, 9:18 p.m. UTC | #1
Hi Khem,

On Wed, Feb 16, 2022 at 2:10 PM Fabio Estevam <festevam@gmail.com> wrote:
>
> From: Fabio Estevam <festevam@denx.de>
>
> The patch that adds the rtc-tools Makefile has been accepted
> upstream, so update to the latest 2022.02 version and remove the
> local Makefile patch.
>
> Also, rename the recipe to reflect the new version.
>
> Signed-off-by: Fabio Estevam <festevam@denx.de>
> ---
> Changes since v1:
> - Use the 2022.02 tag (Peter)
>
>  .../0001-rtc-tools-Add-a-Makefile.patch       | 39 -------------------
>  ...tc-tools_1.0.0.bb => rtc-tools_2022.02.bb} |  6 +--
>  2 files changed, 2 insertions(+), 43 deletions(-)
>  delete mode 100644 meta-oe/recipes-support/rtc-tools/rtc-tools/0001-rtc-tools-Add-a-Makefile.patch
>  rename meta-oe/recipes-support/rtc-tools/{rtc-tools_1.0.0.bb => rtc-tools_2022.02.bb} (64%)

I see that the version applied in master-next is more similar to the
previous version of this patch, ie, without the recipe rename:

https://github.com/openembedded/meta-openembedded/commit/2cbb945d69104ffa51cba655626e66b46ee42380#diff-902da3ea68cbf9d19e75fd71125e1c0d61ee5d611640a7d1e7df36d277312600

Would you like me to send an incremental patch doing the rename?

Please advise.
Khem Raj Feb. 16, 2022, 9:24 p.m. UTC | #2
On Wed, Feb 16, 2022 at 1:18 PM Fabio Estevam <festevam@gmail.com> wrote:
>
> Hi Khem,
>
> On Wed, Feb 16, 2022 at 2:10 PM Fabio Estevam <festevam@gmail.com> wrote:
> >
> > From: Fabio Estevam <festevam@denx.de>
> >
> > The patch that adds the rtc-tools Makefile has been accepted
> > upstream, so update to the latest 2022.02 version and remove the
> > local Makefile patch.
> >
> > Also, rename the recipe to reflect the new version.
> >
> > Signed-off-by: Fabio Estevam <festevam@denx.de>
> > ---
> > Changes since v1:
> > - Use the 2022.02 tag (Peter)
> >
> >  .../0001-rtc-tools-Add-a-Makefile.patch       | 39 -------------------
> >  ...tc-tools_1.0.0.bb => rtc-tools_2022.02.bb} |  6 +--
> >  2 files changed, 2 insertions(+), 43 deletions(-)
> >  delete mode 100644 meta-oe/recipes-support/rtc-tools/rtc-tools/0001-rtc-tools-Add-a-Makefile.patch
> >  rename meta-oe/recipes-support/rtc-tools/{rtc-tools_1.0.0.bb => rtc-tools_2022.02.bb} (64%)
>
> I see that the version applied in master-next is more similar to the
> previous version of this patch, ie, without the recipe rename:
>
> https://github.com/openembedded/meta-openembedded/commit/2cbb945d69104ffa51cba655626e66b46ee42380#diff-902da3ea68cbf9d19e75fd71125e1c0d61ee5d611640a7d1e7df36d277312600
>
> Would you like me to send an incremental patch doing the rename?
>
> Please advise.

I have taken v2 as whole.

Patch

diff --git a/meta-oe/recipes-support/rtc-tools/rtc-tools/0001-rtc-tools-Add-a-Makefile.patch b/meta-oe/recipes-support/rtc-tools/rtc-tools/0001-rtc-tools-Add-a-Makefile.patch
deleted file mode 100644
index 1d16a66088e8..000000000000
--- a/meta-oe/recipes-support/rtc-tools/rtc-tools/0001-rtc-tools-Add-a-Makefile.patch
+++ /dev/null
@@ -1,39 +0,0 @@ 
-From 3e9dfc0f21191bdb3ab719479e9c1997a61c5044 Mon Sep 17 00:00:00 2001
-From: Fabio Estevam <festevam@denx.de>
-Date: Fri, 28 Jan 2022 13:34:45 -0300
-Subject: [PATCH] rtc-tools: Add a Makefile
-
-Add a Makefile to make installation and uninstallation
-process easier.
-
-Upstream-Status: Submitted [https://marc.info/?l=linux-rtc&m=164332426030004&w=2]
-Signed-off-by: Fabio Estevam <festevam@denx.de>
----
- Makefile | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
- create mode 100644 Makefile
-
-diff --git a/Makefile b/Makefile
-new file mode 100644
-index 0000000..71a4c9c
---- /dev/null
-+++ b/Makefile
-@@ -0,0 +1,16 @@
-+prefix ?= /usr
-+bindir ?= $(prefix)/bin
-+
-+EXEC = rtc-range rtc rtc-sync
-+
-+all: $(EXEC)
-+
-+clean:
-+	$(RM) $(EXEC)
-+
-+install:
-+	install -d $(DESTDIR)$(bindir)
-+	install $(EXEC) $(DESTDIR)$(bindir)
-+
-+uninstall:
-+	$(RM) -r $(addprefix $(DESTDIR)$(bindir)/,$(EXEC))
---
-2.25.1
diff --git a/meta-oe/recipes-support/rtc-tools/rtc-tools_1.0.0.bb b/meta-oe/recipes-support/rtc-tools/rtc-tools_2022.02.bb
similarity index 64%
rename from meta-oe/recipes-support/rtc-tools/rtc-tools_1.0.0.bb
rename to meta-oe/recipes-support/rtc-tools/rtc-tools_2022.02.bb
index 303585a6591d..d65f5da859af 100644
--- a/meta-oe/recipes-support/rtc-tools/rtc-tools_1.0.0.bb
+++ b/meta-oe/recipes-support/rtc-tools/rtc-tools_2022.02.bb
@@ -2,10 +2,8 @@  SUMMARY = "Useful programs to test rtc drivers"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=74274e8a218423e49eefdea80bc55038"
 
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/${BPN}.git;protocol=https;branch=master \
-           file://0001-rtc-tools-Add-a-Makefile.patch \
-           "
-SRCREV = "acc442e7af4e1e783432a43d37f1a7938c692659"
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/${BPN}.git;protocol=https;branch=master"
+SRCREV = "61839777afedcc7bdb68ea4628c5ce5ca72c2ac8"
 
 S = "${WORKDIR}/git"