Skip to contentSkip to conversation

package/bcm2835: disable doxygen doc generation

PATCH New Peter Seiderer 2 participants 6 messages Jun 3, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/3 package/bcm2835: disable doxygen doc generation

---
Changes v1 -> v2:
- split of from original patch (suggested by Thomas Petazzoni)

---
 package/bcm2835/bcm2835.mk | 3 +++
 1 file changed, 3 insertions(+)
package/bcm2835/bcm2835.mk +3 -0
index d43dd7e574..f75b2fc69e 100644
@@ -10,4 +10,7 @@ BCM2835_LICENSE = GPL-3.0
 BCM2835_LICENSE_FILES = COPYING
 BCM2835_INSTALL_STAGING = YES
 
+# disable doxygen doc generation
+BCM2835_CONF_ENV = ac_cv_prog_DOXYGEN=/bin/true
+
 $(eval $(autotools-package))
Signature · 1 line
2.26.2
#1 lore raw

PATCH v2 2/3 package/bcm2835: bump version to 1.65

Changes since 1.63:
- 1.64 2020-04-11 Fixed error in definitions of BCM2835_AUX_SPI_STAT_TX_LVL and BCM2835_AUX_SPI_STAT_RX_LVL
- 1.65, 1.66 2020-04-16 Added support for use of capability cap_sys_rawio to determine if access to /dev/mem is available for non-root users

---
Changes v1 -> v2:
- split original patch into three independent ones

---
 package/bcm2835/bcm2835.hash | 2 +-
 package/bcm2835/bcm2835.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/bcm2835/bcm2835.hash +1 -1
index c722a97456..8317e10256 100644
@@ -1,3 +1,3 @@
 # Locally computed:
-sha256  aec4b33ed9ecda4a1c4c12b8ed2abdd13cf87f352f0d27a24be726d11f1fbf54  bcm2835-1.63.tar.gz
+sha256  62955cc8506cc6506d729da3138442beb9763f1ffd536e925aeb0dc223492874  bcm2835-1.65.tar.gz
 sha256  8b1ba204bb69a0ade2bfcf65ef294a920f6bb361b317dba43c7ef29d96332b9b  COPYING
package/bcm2835/bcm2835.mk +1 -1
index f75b2fc69e..2ef6d94b38 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-BCM2835_VERSION = 1.63
+BCM2835_VERSION = 1.65
 BCM2835_SITE = http://www.airspayce.com/mikem/bcm2835
 BCM2835_LICENSE = GPL-3.0
 BCM2835_LICENSE_FILES = COPYING
Signature · 1 line
2.26.2
#2 lore raw

PATCH v2 2/3 package/bcm2835: bump version to 1.65

Peter, All,

On 2020-06-03 12:38 +0200, Peter Seiderer spake thusly:

Quoted 7 lines

Changes since 1.63:
- 1.64 2020-04-11 Fixed error in definitions of BCM2835_AUX_SPI_STAT_TX_LVL and BCM2835_AUX_SPI_STAT_RX_LVL
- 1.65, 1.66 2020-04-16 Added support for use of capability cap_sys_rawio to determine if access to /dev/mem is available for non-root users

Appleid to master, after adding an explanation about why we don;t use capabilities and how it is borked upstream.

I'm not going to apply the third patch, however: this must be fixed upstream, period (this package is definitely not a nice package...) Previously, that library required running as root; it still does. Not supporting capabilities is thus not a regression.

Regards,
Yann E. MORIN.

Quoted 37 lines

---
Changes v1 -> v2:
- split original patch into three independent ones

---
 package/bcm2835/bcm2835.hash | 2 +-
 package/bcm2835/bcm2835.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/bcm2835/bcm2835.hash +1 -1
index c722a97456..8317e10256 100644
@@ -1,3 +1,3 @@
 # Locally computed:
-sha256  aec4b33ed9ecda4a1c4c12b8ed2abdd13cf87f352f0d27a24be726d11f1fbf54  bcm2835-1.63.tar.gz
+sha256  62955cc8506cc6506d729da3138442beb9763f1ffd536e925aeb0dc223492874  bcm2835-1.65.tar.gz
 sha256  8b1ba204bb69a0ade2bfcf65ef294a920f6bb361b317dba43c7ef29d96332b9b  COPYING
package/bcm2835/bcm2835.mk +1 -1
index f75b2fc69e..2ef6d94b38 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-BCM2835_VERSION = 1.63
+BCM2835_VERSION = 1.65
 BCM2835_SITE = http://www.airspayce.com/mikem/bcm2835
 BCM2835_LICENSE = GPL-3.0
 BCM2835_LICENSE_FILES = COPYING
Signature · 6 lines
2.26.2

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#3 lore raw

PATCH v2 3/3 package/bcm2835: add cap_sys_rawio capability support

In reply to Peter Seiderer

Add cap_sys_rawio capability support in case libcap is available.

---
Changes v1 -> v2:
- split of from original patch and fixed for

    BCM2835_HAVE_LIBCAP/BCM2835_HAVE_LIBCAP2 typo
---
 package/bcm2835/bcm2835.mk | 6 ++++++
 1 file changed, 6 insertions(+)
package/bcm2835/bcm2835.mk +6 -0
index 2ef6d94b38..1cabd72e5d 100644
@@ -13,4 +13,10 @@ BCM2835_INSTALL_STAGING = YES
 # disable doxygen doc generation
 BCM2835_CONF_ENV = ac_cv_prog_DOXYGEN=/bin/true
 
+ifeq ($(BR2_PACKAGE_LIBCAP),y)
+BCM2835_DEPENDENCIES = libcap
+# workaround typo in src/bcm2835.c and use both defines
+BCM2835_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -DBCM2835_HAVE_LIBCAP -DBCM2835_HAVE_LIBCAP2"
+endif
+
 $(eval $(autotools-package))
Signature · 1 line
2.26.2
#4 lore raw

PATCH v2 3/3 package/bcm2835: add cap_sys_rawio capability support

Peter, All,

On 2020-06-03 12:38 +0200, Peter Seiderer spake thusly:

Quoted 16 lines

Add cap_sys_rawio capability support in case libcap is available.

---
Changes v1 -> v2:
- split of from original patch and fixed for

    BCM2835_HAVE_LIBCAP/BCM2835_HAVE_LIBCAP2 typo
---
 package/bcm2835/bcm2835.mk | 6 ++++++
 1 file changed, 6 insertions(+)
package/bcm2835/bcm2835.mk +0 -0
index 2ef6d94b38..1cabd72e5d 100644

package/bcm2835/bcm2835.mk BCM2835_INSTALL_STAGING = YES · line 19

Quoted 7 lines
package/bcm2835/bcm2835.mk +4 -0
@@ -13,4 +13,10 @@ BCM2835_INSTALL_STAGING = YES
 # disable doxygen doc generation
 BCM2835_CONF_ENV = ac_cv_prog_DOXYGEN=/bin/true
 
+ifeq ($(BR2_PACKAGE_LIBCAP),y)
+BCM2835_DEPENDENCIES = libcap
+# workaround typo in src/bcm2835.c and use both defines
+BCM2835_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -DBCM2835_HAVE_LIBCAP -DBCM2835_HAVE_LIBCAP2"

As reported by Thomas, this is just a stupid bug in the code. It should be fixed by sending upstream a patch.

(note: this is hilarious... not.)

Regards,
Yann E. MORIN.

Quoted 10 lines
package/bcm2835/bcm2835.mk +2 -0
+endif
+
 $(eval $(autotools-package))
Signature · 6 lines
2.26.2

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#5 lore raw

PATCH v2 1/3 package/bcm2835: disable doxygen doc generation

In reply to Peter Seiderer

Peter, All,

On 2020-06-03 12:38 +0200, Peter Seiderer spake thusly:

Quoted 1 line

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 26 lines

---
Changes v1 -> v2:
- split of from original patch (suggested by Thomas Petazzoni)

---
 package/bcm2835/bcm2835.mk | 3 +++
 1 file changed, 3 insertions(+)
package/bcm2835/bcm2835.mk +3 -0
index d43dd7e574..f75b2fc69e 100644
@@ -10,4 +10,7 @@ BCM2835_LICENSE = GPL-3.0
 BCM2835_LICENSE_FILES = COPYING
 BCM2835_INSTALL_STAGING = YES
 
+# disable doxygen doc generation
+BCM2835_CONF_ENV = ac_cv_prog_DOXYGEN=/bin/true
+
 $(eval $(autotools-package))
Signature · 6 lines
2.26.2

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'