Skip to contentSkip to conversation

augeas: new package

PATCH Superseded Jörg Krause 3 participants 6 messages Feb 10, 2017 – Feb 13, 2017

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 augeas: new package

Augeas is a configuration editing tool. It parses configuration files in their native formats and transforms them into a tree. Configuration changes are made by manipulating this tree and saving it back into native config files.

---
 package/Config.in          |  1 +
 package/augeas/Config.in   | 11 +++++++++++
 package/augeas/augeas.hash |  2 ++
 package/augeas/augeas.mk   | 22 ++++++++++++++++++++++
 4 files changed, 36 insertions(+)
 create mode 100644 package/augeas/Config.in
 create mode 100644 package/augeas/augeas.hash
 create mode 100644 package/augeas/augeas.mk
package/Config.in +1 -0
index 114a5ad5f..6956a788a 100644
@@ -1409,6 +1409,7 @@ menu "Security"
 endmenu
 
 menu "Text and terminal handling"
+	source "package/augeas/Config.in"
 	source "package/enchant/Config.in"
 	source "package/icu/Config.in"
 	source "package/libcli/Config.in"
package/augeas/Config.in new file +11 -0
new file mode 100644
index 000000000..efbc19b43
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_AUGEAS
+	bool "augeas"
+	select BR2_PACKAGE_LIBXML2
+	select BR2_PACKAGE_READLINE
+	help
+	  Augeas is a configuration editing tool. It parses configuration
+	  files in their native formats and transforms them into a tree.
+	  Configuration changes are made by manipulating this tree and
+	  saving it back into native config files.
+
+	  http://augeas.net
package/augeas/augeas.hash new file +2 -0
new file mode 100644
index 000000000..9640757eb
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256  b9315575d07f7ba28ca2f9f60b4987dfe77b5970c98b59dc6ca7873fc4979763  augeas-1.7.0.tar.gz
package/augeas/augeas.mk new file +22 -0
new file mode 100644
index 000000000..7a1f2f8ce
@@ -0,0 +1,22 @@
+################################################################################
+#
+# augeas
+#
+################################################################################
+
+AUGEAS_VERSION = 1.7.0
+AUGEAS_SITE = http://download.augeas.net
+AUGEAS_INSTALL_STAGING = YES
+AUGEAS_LICENSE = LGPLv2.1+
+AUGEAS_LICENSE_FILES = COPYING
+AUGEAS_DEPENDENCIES = host-pkgconf readline libxml2
+
+AUGEAS_CONF_OPTS = --disable-gnulib-tests
+
+# Remove the test lenses which occupy about 1.4 MB on the target
+define AUGEAS_REMOVE_TEST_LENSES
+	rm -rf $(TARGET_DIR)/usr/share/augeas/lenses/dist/tests
+endef
+AUGEAS_POST_INSTALL_TARGET_HOOKS += AUGEAS_REMOVE_TEST_LENSES
+
+$(eval $(autotools-package))
Signature · 1 line
2.11.1
#1 lore raw

PATCH 2/2 DEVELOPERS: add Jörg Krause for augeus

---
 DEVELOPERS | 1 +
 1 file changed, 1 insertion(+)
DEVELOPERS +1 -0
index b8ccb4615..71f9fcad3 100644
@@ -893,6 +893,7 @@ F:	package/x11r7/xdriver_xf86-video-imx/
 F:	package/x11r7/xdriver_xf86-video-imx-viv/
 
 N:	J?rg Krause <[email protected]>
+F:	package/augeas/
 F:	package/bctoolbox/
 F:	package/libshout/
 F:	package/libupnpp/
Signature · 1 line
2.11.1
#2 lore raw

PATCH 2/2 DEVELOPERS: add Jörg Krause for augeus

Hello,

Quoted 10 lines · J?rg Krause
---
 DEVELOPERS | 1 +
 1 file changed, 1 insertion(+)
DEVELOPERS +0 -0
index b8ccb4615..71f9fcad3 100644

DEVELOPERS F: package/x11r7/xdriver_xf86-video-imx/ · line 899

Quoted 7 lines
DEVELOPERS +1 -0
@@ -893,6 +893,7 @@ F:	package/x11r7/xdriver_xf86-video-imx/
 F:	package/x11r7/xdriver_xf86-video-imx-viv/
 
 N:	J?rg Krause <[email protected]>
+F:	package/augeas/
 F:	package/bctoolbox/
 F:	package/libshout/
 F:	package/libupnpp/

We have changed our mind at the last Buildroot developers meeting. We now want the modification to the DEVELOPERS file to be part of the patch adding the package. Since you received some feedback on the .mk file itself, could you resubmit, with the DEVELOPERS changes merged in the main patch?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
#3 lore raw

PATCH 2/2 DEVELOPERS: add Jörg Krause for augeus

Hi Thomas,

Quoted 19 lines · Thomas Petazzoni

Hello,

Quoted 16 lines · J?rg Krause

---
?DEVELOPERS | 1 +
?1 file changed, 1 insertion(+)

DEVELOPERS +0 -0
index b8ccb4615..71f9fcad3 100644
@@ -893,6 +893,7 @@ F:	package/x11r7/xdriver_xf86-video-imx/

?F: package/x11r7/xdriver_xf86-video-imx-viv/
?
?N: J?rg Krause <[email protected]>
+F: package/augeas/
?F: package/bctoolbox/
?F: package/libshout/

Quoted 8 lines
Quoted 1 line

?F: package/libupnpp/

We have changed our mind at the last Buildroot developers meeting. We now want the modification to the DEVELOPERS file to be part of the patch adding the package. Since you received some feedback on the .mk file itself, could you resubmit, with the DEVELOPERS changes merged in
the main patch?

Of course!

J?rg

#4 lore raw

PATCH 1/2 augeas: new package

In reply to Jörg Krause

Hi J?rg,

Le 10/02/2017 ? 12:00, J?rg Krause a ?crit :

Quoted 34 lines

Augeas is a configuration editing tool. It parses configuration files in their native formats and transforms them into a tree. Configuration changes are made by manipulating this tree and saving it back into native config files.

---
 package/Config.in          |  1 +
 package/augeas/Config.in   | 11 +++++++++++
 package/augeas/augeas.hash |  2 ++
 package/augeas/augeas.mk   | 22 ++++++++++++++++++++++
 4 files changed, 36 insertions(+)
 create mode 100644 package/augeas/Config.in
 create mode 100644 package/augeas/augeas.hash
 create mode 100644 package/augeas/augeas.mk
package/Config.in +1 -0
index 114a5ad5f..6956a788a 100644
@@ -1409,6 +1409,7 @@ menu "Security"
 endmenu
 
 menu "Text and terminal handling"
+	source "package/augeas/Config.in"
 	source "package/enchant/Config.in"
 	source "package/icu/Config.in"
 	source "package/libcli/Config.in"
package/augeas/Config.in new file +0 -0
new file mode 100644
index 000000000..efbc19b43

package/augeas/Config.in line 9

Quoted 9 lines
package/augeas/Config.in new file +9 -0
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_AUGEAS
+	bool "augeas"
+	select BR2_PACKAGE_LIBXML2
+	select BR2_PACKAGE_READLINE
+	help
+	  Augeas is a configuration editing tool. It parses configuration
+	  files in their native formats and transforms them into a tree.
+	  Configuration changes are made by manipulating this tree and
+	  saving it back into native config files.

"The help text should be wrapped to fit 72 columns." see [1]

Note: one Tab count as 8 characters.

[1] http://nightly.buildroot.org/#writing-rules-config-in

Quoted 26 lines
package/augeas/Config.in new file +2 -0
+
+	  http://augeas.net
package/augeas/augeas.hash new file +2 -0
new file mode 100644
index 000000000..9640757eb
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256  b9315575d07f7ba28ca2f9f60b4987dfe77b5970c98b59dc6ca7873fc4979763  augeas-1.7.0.tar.gz
package/augeas/augeas.mk new file +10 -0
new file mode 100644
index 000000000..7a1f2f8ce
@@ -0,0 +1,22 @@
+################################################################################
+#
+# augeas
+#
+################################################################################
+
+AUGEAS_VERSION = 1.7.0
+AUGEAS_SITE = http://download.augeas.net
+AUGEAS_INSTALL_STAGING = YES
+AUGEAS_LICENSE = LGPLv2.1+

package/augeas/augeas.mk line 20

Quoted 10 lines
package/augeas/augeas.mk new file +10 -0
+AUGEAS_LICENSE_FILES = COPYING
+AUGEAS_DEPENDENCIES = host-pkgconf readline libxml2
+
+AUGEAS_CONF_OPTS = --disable-gnulib-tests
+
+# Remove the test lenses which occupy about 1.4 MB on the target
+define AUGEAS_REMOVE_TEST_LENSES
+	rm -rf $(TARGET_DIR)/usr/share/augeas/lenses/dist/tests
+endef
+AUGEAS_POST_INSTALL_TARGET_HOOKS += AUGEAS_REMOVE_TEST_LENSES

The packaging looks good but augeas fail to build with some toolchain/arch:

./support/scripts/test-pkg -c pkg-config -d test-pkg/ -p augeas

br-arcle-hs38: download config, olddefconfig, dirclean, build: FAILED

/tmp/ccQRgMGk.s: Assembler messages:
/tmp/ccQRgMGk.s:1159: Error: Bad expression: @pcl + , at .LANCHOR0@pcl-24. /tmp/ccQRgMGk.s:1159: Error: extra comma
/tmp/ccQRgMGk.s:1159: Error: syntax error

Maybe report this one to ARC people...

br-arm-basic: download config, olddefconfig, dirclean, build: FAILED

./.libs/libaugeas.so: undefined reference to wctomb' ./.libs/libaugeas.so: undefined reference to mbtowc'

br-arm-cortex-m4-full: download config, olddefconfig, dirclean, build: FAILED
br-arm-full-static: download config, olddefconfig, dirclean, build: FAILED
br-m68k-5208-full: download config, olddefconfig, dirclean, build: FAILED

./.libs/libaugeas.a(internal.o): In function `xasprintf':
internal.c:(.text+0x64c): multiple definition of `xasprintf' augtool.o:augtool.c:(.text+0x5d8): first defined here

Can you take a look?

Best regards,
Romain

Quoted 3 lines
package/augeas/augeas.mk new file +2 -0
+
+$(eval $(autotools-package))
#5 lore raw

PATCH 1/2 augeas: new package

Hi Romain,

Quoted 53 lines · Romain Naour

Hi J?rg,

Le 10/02/2017 ? 12:00, J?rg Krause a ?crit :

Quoted 46 lines

Augeas is a configuration editing tool. It parses configuration files in
their native formats and transforms them into a tree. Configuration changes are made by manipulating this tree and saving it back into native config files.

---

?package/Config.in??????????|??1 +
?package/augeas/Config.in???| 11 +++++++++++
?package/augeas/augeas.hash |??2 ++
?package/augeas/augeas.mk???| 22 ++++++++++++++++++++++

?4 files changed, 36 insertions(+)
?create mode 100644 package/augeas/Config.in
?create mode 100644 package/augeas/augeas.hash
?create mode 100644 package/augeas/augeas.mk

package/Config.in +0 -0
index 114a5ad5f..6956a788a 100644
@@ -1409,6 +1409,7 @@ menu "Security"

?endmenu
?
?menu "Text and terminal handling"

package/Config.in +1 -0
+	source "package/augeas/Config.in"

? source "package/enchant/Config.in"
? source "package/icu/Config.in"
? source "package/libcli/Config.in"

package/augeas/Config.in new file +6 -0
new file mode 100644
index 000000000..efbc19b43
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_AUGEAS
+	bool "augeas"
+	select BR2_PACKAGE_LIBXML2
+	select BR2_PACKAGE_READLINE
+	help
+	??Augeas is a configuration editing tool. It parses

configuration

package/augeas/Config.in new file +1 -0
+	??files in their native formats and transforms them into a

tree.

package/augeas/Config.in new file +1 -0
+	??Configuration changes are made by manipulating this tree

and

package/augeas/Config.in

Quoted 1 line
package/augeas/Config.in new file +1 -0
+	??saving it back into native config files.

"The help text should be wrapped to fit 72 columns." see [1]

Quoted 3 lines

Note: one Tab count as 8 characters.

[1] http://nightly.buildroot.org/#writing-rules-config-in

I was confused by the definition of "help text". I thought the help text is only the text and does not imply the tab and the two spaces before the text.

Quoted 67 lines
Quoted 29 lines
package/augeas/Config.in new file +1 -0
+	??http://augeas.net
package/augeas/augeas.hash new file +2 -0
new file mode 100644
index 000000000..9640757eb
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256??b9315575d07f7ba28ca2f9f60b4987dfe77b5970c98b59dc6ca7873fc4

979763??augeas-1.7.0.tar.gz

package/augeas/augeas.mk new file +1 -0
new file mode 100644
index 000000000..7a1f2f8ce
@@ -0,0 +1,22 @@
+##################################################################

##############

package/augeas/augeas.mk new file +4 -0
+#
+# augeas
+#
+##################################################################

##############

package/augeas/augeas.mk new file +5 -0
+
+AUGEAS_VERSION = 1.7.0
+AUGEAS_SITE = http://download.augeas.net
+AUGEAS_INSTALL_STAGING = YES
+AUGEAS_LICENSE = LGPLv2.1+

package/augeas/augeas.mk line 20

Quoted 10 lines
package/augeas/augeas.mk new file +10 -0
+AUGEAS_LICENSE_FILES = COPYING
+AUGEAS_DEPENDENCIES = host-pkgconf readline libxml2
+
+AUGEAS_CONF_OPTS = --disable-gnulib-tests
+
+# Remove the test lenses which occupy about 1.4 MB on the target
+define AUGEAS_REMOVE_TEST_LENSES
+	rm -rf $(TARGET_DIR)/usr/share/augeas/lenses/dist/tests
+endef
+AUGEAS_POST_INSTALL_TARGET_HOOKS += AUGEAS_REMOVE_TEST_LENSES

The packaging looks good but augeas fail to build with some toolchain/arch:

./support/scripts/test-pkg -c pkg-config -d test-pkg/ -p augeas

br-arcle-hs38: download config, olddefconfig, dirclean, build: FAILED

/tmp/ccQRgMGk.s: Assembler messages:
/tmp/ccQRgMGk.s:1159: Error: Bad expression: @pcl + , at .LANCHOR0@pcl-2 4.
/tmp/ccQRgMGk.s:1159: Error: extra comma /tmp/ccQRgMGk.s:1159: Error: syntax error

Maybe report this one to ARC people...

br-arm-basic: download config, olddefconfig, dirclean, build: FAILED

./.libs/libaugeas.so: undefined reference to wctomb' ./.libs/libaugeas.so: undefined reference to mbtowc'

br-arm-cortex-m4-full: download config, olddefconfig, dirclean,
build: FAILED
br-arm-full-static: download config, olddefconfig, dirclean, build:
FAILED
br-m68k-5208-full: download config, olddefconfig, dirclean, build:
FAILED

Quoted 3 lines

./.libs/libaugeas.a(internal.o): In function `xasprintf':
internal.c:(.text+0x64c): multiple definition of `xasprintf' augtool.o:augtool.c:(.text+0x5d8): first defined here

I didn't know about test-pkg. Nice tool! It is running right now and I'll check the build errors.

J?rg