diff mbox series

[1/1] package/davinci-bootcount: rename as uboot-bootcount

Message ID 20230917143452.1374576-1-dario.binacchi@amarulasolutions.com
State New
Headers
Series [1/1] package/davinci-bootcount: rename as uboot-bootcount |

Commit Message

Dario Binacchi Sept. 17, 2023, 2:34 p.m. UTC 
Born as a project to read/write the bootcount on the TI am3xx platform,
over time it has introduced bootcount management on EEPROM and for the
stm32mp1 platform. As a result, the project removed the 'davinci' tag
from its name and GitHub link.
The patch aligns the package name in Buildroot with the current one on
GitHub.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 DEVELOPERS                                        |  2 +-
 package/Config.in                                 |  2 +-
 package/davinci-bootcount/Config.in               | 11 -----------
 package/davinci-bootcount/davinci-bootcount.mk    | 15 ---------------
 package/uboot-bootcount/Config.in                 | 10 ++++++++++
 .../uboot-bootcount.hash}                         |  2 +-
 package/uboot-bootcount/uboot-bootcount.mk        | 15 +++++++++++++++
 7 files changed, 28 insertions(+), 29 deletions(-)
 delete mode 100644 package/davinci-bootcount/Config.in
 delete mode 100644 package/davinci-bootcount/davinci-bootcount.mk
 create mode 100644 package/uboot-bootcount/Config.in
 rename package/{davinci-bootcount/davinci-bootcount.hash => uboot-bootcount/uboot-bootcount.hash} (80%)
 create mode 100644 package/uboot-bootcount/uboot-bootcount.mk

Comments

'Abel Vesa' via Amarula Linux Sept. 17, 2023, 7:49 p.m. UTC | #1 
On 17/09/2023 16:34, Dario Binacchi wrote:
> Born as a project to read/write the bootcount on the TI am3xx platform,
> over time it has introduced bootcount management on EEPROM and for the
> stm32mp1 platform. As a result, the project removed the 'davinci' tag
> from its name and GitHub link.
> The patch aligns the package name in Buildroot with the current one on
> GitHub.

  We try to avoid package renames unless it's really needed, because it causes 
some annoyance when updating Buildroot.

  In this specific case, the package name (davinci-bootcount) was already not 
aligned with the (original) upstream name (uboot-davinci-bootcount).

  That said - if you don't have a davinci, then with the name "uboot-bootcount" 
the package is a lot more discoverable, so there is probably a good reason to 
update it.

  Still, I think it's worth to make two separate patches: one which updates the 
URL (both in the .mk and Config.in), and perhaps also updates the help text. 
This patch can be backported to the stable branches. And then a second patch 
that changes the package name.

> 
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
> ---
>   DEVELOPERS                                        |  2 +-
>   package/Config.in                                 |  2 +-
>   package/davinci-bootcount/Config.in               | 11 -----------
>   package/davinci-bootcount/davinci-bootcount.mk    | 15 ---------------
>   package/uboot-bootcount/Config.in                 | 10 ++++++++++
>   .../uboot-bootcount.hash}                         |  2 +-
>   package/uboot-bootcount/uboot-bootcount.mk        | 15 +++++++++++++++

  You're missing legacy handling. The top of Config.in.legacy is hopefully 
sufficient documentation to know how to do it (if not, patches welcome :-).

[snip]
> diff --git a/package/uboot-bootcount/Config.in b/package/uboot-bootcount/Config.in
> new file mode 100644
> index 000000000000..0a18e5d1bbad
> --- /dev/null
> +++ b/package/uboot-bootcount/Config.in
> @@ -0,0 +1,10 @@
> +config BR2_PACKAGE_UBOOT_BOOTCOUNT
> +	bool "uboot-bootcount"
> +	depends on BR2_arm

  Below you write that it can also come from EEPROM, which means it's not 
limited to ARM.

  Regards,
  Arnout


> +	help
> +	  U-Boot implements a boot count scheme that can be used to
> +	  detect multiple failed attempts to boot Linux. This tool
> +	  allows to read and write bootcount from userspace for some
> +	  platforms (TI AM335X or STM32MP1) or from I2C EEPROM.
> +
> +	  https://github.com/VoltServer/uboot-bootcount
> diff --git a/package/davinci-bootcount/davinci-bootcount.hash b/package/uboot-bootcount/uboot-bootcount.hash
> similarity index 80%
> rename from package/davinci-bootcount/davinci-bootcount.hash
> rename to package/uboot-bootcount/uboot-bootcount.hash
> index 53435b1d1d6d..e1ebc442357e 100644
> --- a/package/davinci-bootcount/davinci-bootcount.hash
> +++ b/package/uboot-bootcount/uboot-bootcount.hash
> @@ -1,3 +1,3 @@
>   # Locally calculated
> -sha256  12b5aa83736efb2fefd22cd4d9f305a25c68dfaa10401d5efb17e55a5163934e  davinci-bootcount-2.0.0.tar.gz
> +sha256  12b5aa83736efb2fefd22cd4d9f305a25c68dfaa10401d5efb17e55a5163934e  uboot-bootcount-2.0.0.tar.gz
>   sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING
> diff --git a/package/uboot-bootcount/uboot-bootcount.mk b/package/uboot-bootcount/uboot-bootcount.mk
> new file mode 100644
> index 000000000000..07b52ab89eb5
> --- /dev/null
> +++ b/package/uboot-bootcount/uboot-bootcount.mk
> @@ -0,0 +1,15 @@
> +################################################################################
> +#
> +# uboot-bootcount
> +#
> +################################################################################
> +
> +UBOOT_BOOTCOUNT_VERSION = 2.0.0
> +UBOOT_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-bootcount,v$(UBOOT_BOOTCOUNT_VERSION))
> +UBOOT_BOOTCOUNT_LICENSE = GPL-3.0
> +UBOOT_BOOTCOUNT_LICENSE_FILES = COPYING
> +
> +# sources fetched from github, no configure script
> +UBOOT_BOOTCOUNT_AUTORECONF = YES
> +
> +$(eval $(autotools-package))
diff mbox series

Patch

diff --git a/DEVELOPERS b/DEVELOPERS
index 7fae4841e448..87c911f22460 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -739,7 +739,7 @@  F:	package/sscep/
 F:	package/uuu/
 
 N:	Dario Binacchi <dariobin@libero.it>
-F:	package/davinci-bootcount/
+F:	package/uboot-bootcount/
 F:	package/libmnl/
 
 N:	David Bachelart <david.bachelart@bbright.com>
diff --git a/package/Config.in b/package/Config.in
index e8dbadadf323..0ac137fc1ca0 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -476,7 +476,6 @@  endmenu
 	source "package/cwiid/Config.in"
 	source "package/dahdi-linux/Config.in"
 	source "package/dahdi-tools/Config.in"
-	source "package/davinci-bootcount/Config.in"
 	source "package/dbus/Config.in"
 	source "package/dbus-broker/Config.in"
 	source "package/dbus-cpp/Config.in"
@@ -627,6 +626,7 @@  endmenu
 	source "package/ti-utils/Config.in"
 	source "package/tio/Config.in"
 	source "package/triggerhappy/Config.in"
+	source "package/uboot-bootcount/Config.in"
 	source "package/uboot-tools/Config.in"
 	source "package/ubus/Config.in"
 	source "package/udev/Config.in"
diff --git a/package/davinci-bootcount/Config.in b/package/davinci-bootcount/Config.in
deleted file mode 100644
index e34adde570af..000000000000
--- a/package/davinci-bootcount/Config.in
+++ /dev/null
@@ -1,11 +0,0 @@ 
-config BR2_PACKAGE_DAVINCI_BOOTCOUNT
-	bool "davinci-bootcount"
-	depends on BR2_arm # only relevant for TI am335x
-	help
-	  U-Boot implements a boot count scheme that can be used to
-	  detect multiple failed attempts to boot Linux. On Davinci
-	  platform (TI AM 335x) the `bootcount' is stored in the RTC
-	  SCRATCH2 register. This tool allows to read and write this
-	  register from userspace.
-
-	  https://github.com/VoltServer/uboot-davinci-bootcount
diff --git a/package/davinci-bootcount/davinci-bootcount.mk b/package/davinci-bootcount/davinci-bootcount.mk
deleted file mode 100644
index 695d39688ac6..000000000000
--- a/package/davinci-bootcount/davinci-bootcount.mk
+++ /dev/null
@@ -1,15 +0,0 @@ 
-################################################################################
-#
-# davinci-bootcount
-#
-################################################################################
-
-DAVINCI_BOOTCOUNT_VERSION = 2.0.0
-DAVINCI_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-davinci-bootcount,v$(DAVINCI_BOOTCOUNT_VERSION))
-DAVINCI_BOOTCOUNT_LICENSE = GPL-3.0
-DAVINCI_BOOTCOUNT_LICENSE_FILES = COPYING
-
-# sources fetched from github, no configure script
-DAVINCI_BOOTCOUNT_AUTORECONF = YES
-
-$(eval $(autotools-package))
diff --git a/package/uboot-bootcount/Config.in b/package/uboot-bootcount/Config.in
new file mode 100644
index 000000000000..0a18e5d1bbad
--- /dev/null
+++ b/package/uboot-bootcount/Config.in
@@ -0,0 +1,10 @@ 
+config BR2_PACKAGE_UBOOT_BOOTCOUNT
+	bool "uboot-bootcount"
+	depends on BR2_arm
+	help
+	  U-Boot implements a boot count scheme that can be used to
+	  detect multiple failed attempts to boot Linux. This tool
+	  allows to read and write bootcount from userspace for some
+	  platforms (TI AM335X or STM32MP1) or from I2C EEPROM.
+
+	  https://github.com/VoltServer/uboot-bootcount
diff --git a/package/davinci-bootcount/davinci-bootcount.hash b/package/uboot-bootcount/uboot-bootcount.hash
similarity index 80%
rename from package/davinci-bootcount/davinci-bootcount.hash
rename to package/uboot-bootcount/uboot-bootcount.hash
index 53435b1d1d6d..e1ebc442357e 100644
--- a/package/davinci-bootcount/davinci-bootcount.hash
+++ b/package/uboot-bootcount/uboot-bootcount.hash
@@ -1,3 +1,3 @@ 
 # Locally calculated
-sha256  12b5aa83736efb2fefd22cd4d9f305a25c68dfaa10401d5efb17e55a5163934e  davinci-bootcount-2.0.0.tar.gz
+sha256  12b5aa83736efb2fefd22cd4d9f305a25c68dfaa10401d5efb17e55a5163934e  uboot-bootcount-2.0.0.tar.gz
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING
diff --git a/package/uboot-bootcount/uboot-bootcount.mk b/package/uboot-bootcount/uboot-bootcount.mk
new file mode 100644
index 000000000000..07b52ab89eb5
--- /dev/null
+++ b/package/uboot-bootcount/uboot-bootcount.mk
@@ -0,0 +1,15 @@ 
+################################################################################
+#
+# uboot-bootcount
+#
+################################################################################
+
+UBOOT_BOOTCOUNT_VERSION = 2.0.0
+UBOOT_BOOTCOUNT_SITE = $(call github,VoltServer,uboot-bootcount,v$(UBOOT_BOOTCOUNT_VERSION))
+UBOOT_BOOTCOUNT_LICENSE = GPL-3.0
+UBOOT_BOOTCOUNT_LICENSE_FILES = COPYING
+
+# sources fetched from github, no configure script
+UBOOT_BOOTCOUNT_AUTORECONF = YES
+
+$(eval $(autotools-package))