Skip to contentSkip to conversation

package/netsnmp: drop our custom config script fixups

PATCH New Yann E. MORIN 2 participants 3 messages Nov 28, 2018 – Nov 29, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/netsnmp: drop our custom config script fixups

Those custom fixups were added in 2011 with commit d1b42b24b88 (net-snmp: fixup paths in net-snmp-config) before we add generic config scripts fixups in 2013 with commit 834f9311aac (pkg-infra: add <pkg>_CONFIG_FIXUP to fix *-config files)

These custom fixups enclose the includes and libraries paths in single quotes (presumably to protect them from further expnasion by the shell, in case there are spaces for example).

It turns out that this breaks now that we replace the staging dir with $(dirname $0), as it is between single quotes.

It looks like these fixups are really no longer needed anymore, since the generic fixups do the job just fine (and better).

Fixes:

    http://autobuild.buildroot.org/results/2c5/2c5e379a06825bf8588bf070d733d2e1f98dab66/
    http://autobuild.buildroot.org/results/eea/eea704463c3f14dbb9bd7f8aa23d4b61c25987f4/
Cc Thomas Petazzoni <[email protected]>
---
 package/netsnmp/netsnmp.mk | 8 --------
 1 file changed, 8 deletions(-)
package/netsnmp/netsnmp.mk +0 -8
index 65a3f16a4d..4bd65ef17a 100644
@@ -106,12 +106,4 @@ define NETSNMP_INSTALL_INIT_SYSV
 endef
 endif
 
-define NETSNMP_STAGING_NETSNMP_CONFIG_FIXUP
-	$(SED)	"s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include\',g" \
-		-e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \
-		$(STAGING_DIR)/usr/bin/net-snmp-config
-endef
-
-NETSNMP_POST_INSTALL_STAGING_HOOKS += NETSNMP_STAGING_NETSNMP_CONFIG_FIXUP
-
 $(eval $(autotools-package))
Signature · 1 line
2.14.1
#1 lore raw

PATCH 1/1 package/netsnmp: drop our custom config script fixups

Quoted 14 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

Those custom fixups were added in 2011 with commit d1b42b24b88 (net-snmp: fixup paths in net-snmp-config) before we add generic config scripts fixups in 2013 with commit 834f9311aac (pkg-infra: add <pkg>_CONFIG_FIXUP to fix *-config files)

These custom fixups enclose the includes and libraries paths in single quotes (presumably to protect them from further expnasion by the shell, in case there are spaces for example).

It turns out that this breaks now that we replace the staging dir with $(dirname $0), as it is between single quotes.

Quoted 6 lines

It looks like these fixups are really no longer needed anymore, since the generic fixups do the job just fine (and better).

Fixes:

    http://autobuild.buildroot.org/results/2c5/2c5e379a06825bf8588bf070d733d2e1f98dab66/
    http://autobuild.buildroot.org/results/eea/eea704463c3f14dbb9bd7f8aa23d4b61c25987f4/

These are both on next, so I assume this is meant for next?

Committed to next, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 package/netsnmp: drop our custom config script fixups

\Peter, All,

On 2018-11-29 17:23 +0100, Peter Korsgaard spake thusly:

Quoted 6 lines
Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

Fixes:

    http://autobuild.buildroot.org/results/2c5/2c5e379a06825bf8588bf070d733d2e1f98dab66/
    http://autobuild.buildroot.org/results/eea/eea704463c3f14dbb9bd7f8aa23d4b61c25987f4/

These are both on next, so I assume this is meant for next? Committed to next, thanks.

Yes, the patch was meant for next, thanks.

In theory, it should also apply to master, for the reasons explained in the commit log. However, we don't have the rror on master, because we do not have the triggerring change due to PPD preparation patches.

So, to be safe, don't apply on master.

Thanks! ;-)

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'