Skip to contentSkip to conversation

package/smcroute: bump version to v2.5.0

PATCH Superseded Joachim Wiberg 2 participants 4 messages Aug 20, 2021 – Aug 21, 2021

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/smcroute: bump version to v2.5.0

- Upstream has changed to tar.gz
- Drop _SOURCE, fixes check-package warning
- setpgrp not used anymore, no need to override configure cache
- Makefile no longer uses CC?=, drop comment
- Set -std=gnu99 to work around upstream issue #165 on older toolchains, which still have gnu90 as default (sourcery-arm)
- Enable MRDISC build option, needs to be enabled per phyint in smcroute.conf to activate, so safe to has default build flag

---
 package/smcroute/smcroute.hash | 6 +++---
 package/smcroute/smcroute.mk   | 7 ++-----
 2 files changed, 5 insertions(+), 8 deletions(-)
package/smcroute/smcroute.hash +3 -3
index f79ce167ed..01d5eafd59 100644
@@ -1,5 +1,5 @@
 # Locally generated
-sha256	431be94c46646767f69c85fee445277b7e765a55177d3ee29522416cfe2cc067  smcroute-2.4.4.tar.xz
+sha256	fa0a496ee4258c286814b789e1dc4d0be2cc4788adba23e8484ff5d0a65f6cc5  smcroute-2.5.0.tar.gz
 sha256	ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
-# From https://github.com/troglobit/smcroute/releases/download/2.4.4/smcroute-2.4.4.tar.xz.md5
-md5	a1dc8c54c684e8c8de139444f73a0ba3  smcroute-2.4.4.tar.xz
+# From https://github.com/troglobit/smcroute/releases/download/2.5.0/smcroute-2.5.0.tar.gz.md5
+md5	285a2765a4366e7d5ba07139a9f56bd5  smcroute-2.5.0.tar.gz
package/smcroute/smcroute.mk +2 -5
index 0db0e084f6..16197e6f68 100644
@@ -4,16 +4,13 @@
 #
 ################################################################################
 
-SMCROUTE_VERSION = 2.4.4
-SMCROUTE_SOURCE = smcroute-$(SMCROUTE_VERSION).tar.xz
+SMCROUTE_VERSION = 2.5.0
 SMCROUTE_SITE = https://github.com/troglobit/smcroute/releases/download/$(SMCROUTE_VERSION)
 SMCROUTE_LICENSE = GPL-2.0+
 SMCROUTE_LICENSE_FILES = COPYING
 SMCROUTE_CPE_ID_VENDOR = troglobit
 
-SMCROUTE_CONF_OPTS = ac_cv_func_setpgrp_void=yes
-#BUG:The package Makefile uses CC?= even though the package is autotools based
-SMCROUTE_MAKE_ENV = $(TARGET_CONFIGURE_OPTS)
+SMCROUTE_CONF_OPTS = --enable-mrdisc CFLAGS=-std=gnu99
 
 ifeq ($(BR2_PACKAGE_LIBCAP),y)
 SMCROUTE_DEPENDENCIES = libcap
Signature · 6 lines
2.25.1

_______________________________________________
buildroot mailing list
[email protected]
http://lists.busybox.net/mailman/listinfo/buildroot
#1 lore raw

Hello Joachim,

Quoted 23 lines · On Fri, 20 Aug 2021 07:44:19 +0200 Joachim Wiberg <[email protected]> wrote:
package/smcroute/smcroute.hash +3 -3
index f79ce167ed..01d5eafd59 100644
@@ -1,5 +1,5 @@
 # Locally generated
-sha256	431be94c46646767f69c85fee445277b7e765a55177d3ee29522416cfe2cc067  smcroute-2.4.4.tar.xz
+sha256	fa0a496ee4258c286814b789e1dc4d0be2cc4788adba23e8484ff5d0a65f6cc5  smcroute-2.5.0.tar.gz
 sha256	ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
-# From https://github.com/troglobit/smcroute/releases/download/2.4.4/smcroute-2.4.4.tar.xz.md5
-md5	a1dc8c54c684e8c8de139444f73a0ba3  smcroute-2.4.4.tar.xz
+# From https://github.com/troglobit/smcroute/releases/download/2.5.0/smcroute-2.5.0.tar.gz.md5
+md5	285a2765a4366e7d5ba07139a9f56bd5  smcroute-2.5.0.tar.gz
package/smcroute/smcroute.mk +0 -2
index 0db0e084f6..16197e6f68 100644
@@ -4,16 +4,13 @@
 #
 ################################################################################
 
-SMCROUTE_VERSION = 2.4.4
-SMCROUTE_SOURCE = smcroute-$(SMCROUTE_VERSION).tar.xz

package/smcroute/smcroute.mk line 13

Quoted 10 lines
package/smcroute/smcroute.mk +2 -3
+SMCROUTE_VERSION = 2.5.0
 SMCROUTE_SITE = https://github.com/troglobit/smcroute/releases/download/$(SMCROUTE_VERSION)
 SMCROUTE_LICENSE = GPL-2.0+
 SMCROUTE_LICENSE_FILES = COPYING
 SMCROUTE_CPE_ID_VENDOR = troglobit
 
-SMCROUTE_CONF_OPTS = ac_cv_func_setpgrp_void=yes
-#BUG:The package Makefile uses CC?= even though the package is autotools based
-SMCROUTE_MAKE_ENV = $(TARGET_CONFIGURE_OPTS)
+SMCROUTE_CONF_OPTS = --enable-mrdisc CFLAGS=-std=gnu99

Thanks for the update. However, passing CFLAGS=-std=gnu99 is not correct, as it means other Buildroot CFLAGS are no longer passed.

Instead, it should be:

SMCROUTE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS -std=gnu99"

could you see if that works for you, and send an updated version?

Thanks!

Thomas

Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
http://lists.busybox.net/mailman/listinfo/buildroot
#2 lore raw

Hi Thomas!

Quoted 5 lines · Thomas Petazzoni

package/smcroute/smcroute.mk line 13

Quoted 2 lines · On Fri, 20 Aug 2021 07:44:19 +0200 Joachim Wiberg <[email protected]> wrote:
package/smcroute/smcroute.mk +1 -1
-SMCROUTE_MAKE_ENV = $(TARGET_CONFIGURE_OPTS)
+SMCROUTE_CONF_OPTS = --enable-mrdisc CFLAGS=-std=gnu99

Thanks for the update. However, passing CFLAGS=-std=gnu99 is not correct, as it means other Buildroot CFLAGS are no longer passed.

Ouch, that's obviously not what I intended. Sorry about that, and thank you for taking the time to review!

Quoted 3 lines

Instead, it should be:
SMCROUTE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS -std=gnu99" could you see if that works for you, and send an updated version?

Thanks, it was a dirty hack. I'm going to do a new release upstream instead, but I'll keep this for next time I run into something simiar.

Also, do you think it would be OK to add an init start script and add the systemd unit file shipped with SMCRoute? I belive most users would appreciate an easy way to start the daemon. They don't need any .conf file set up, and we can have everything passive by default.

Best regards
/Joachim
_______________________________________________
buildroot mailing list
[email protected]
http://lists.busybox.net/mailman/listinfo/buildroot

#3 lore raw
Quoted 4 lines · On Sat, 21 Aug 2021 19:30:46 +0200 Joachim Wiberg <[email protected]> wrote:

Also, do you think it would be OK to add an init start script and add the systemd unit file shipped with SMCRoute? I belive most users would appreciate an easy way to start the daemon. They don't need any .conf file set up, and we can have everything passive by default.

Sure, it would certainly be fine to have an init script and systemd unit file!

Best regards,

Thomas

Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
http://lists.busybox.net/mailman/listinfo/buildroot