Skip to contentSkip to conversation

package: bump attr and acl, fix builds of dependees

PATCH New Yann E. MORIN 5 participants 20 messages Jun 30, 2018 – Aug 27, 2018

lore
Share & tools
lore

Yann E. MORIN

author
#0 lore raw

v2 cover package: bump attr and acl, fix builds of dependees

Hello All!

This series is an attempt at bumping the attr and acl packages to a later version.

The crux of the changes is to get an attr package that no longer behaves silly [0]. attr has had a complete overhaul of it buildsystem, making it fully autotools-based, which fixes quite a few idiosyncracies of the previous hand-rolled one.

However, this means that attr no longer installs its own copy of xattr.h, on the assumption that it has been provided by glibc "for ages" [1] [2]
[3] [4]. This means that a few packages have to be fixed now, of which acl.

Three packages then need fixing because they still use attr/xattr.h:
stress-ng, which we bump and fix, lua-flu, which we simply fix, and xorriso. Patches were all sent upstream [6] [7] [8].

Of all packages that depend on attr or acl:

    sys        -> checks for, and uses <sys/xattr.h>
    attr       -> checks for, and uses <attr/xattr.h>
    acl        -> checks for, and uses <acl/libacl.h> and/or -lacl
    patched    -> patch added to uses <sys/xattr.h>

no xattr.h -> does not check for <attr/xattr.h> or <sys/xattr.h>,
but uses other <attr/*.h> and -lattr, thus has no problem

acl ACK, sys
coreutils ACK, sys-attr
host-acl ACK, sys
host-fakeroot ACK, sys
host-pseudo ACK, sys
libarchive ACK, attr-sys
logrotate ACK, acl
lua-flu ACK, patched, sys
mtd ACK, sys
netatalk ACK, acl, attr-sys
patch ACK, no xattr.h
rpm ACK, acl
rsync ACK, acl, attr-sys
samba4 ACK, attr-sys [*]
stress-ng ACK, patched, sys
systemd ACK, acl
tar ACK, acl, sys
vim ACK, acl [**]
xorriso ACK, acl, patched, sys

[*] in my testing, I had a systemd-based system, and samba4 failed to install (I'll investigate separately). But at least, it did detect and use <sys/xattr.h> correctly, and the build succeeded. It even installed OK, but our SAMBA4_INSTALL_INIT_SYSTEMD is borked (missing source file.)

[**] vim uses xattr to add support for SMACK. Before this series, it did detect xattr, but failed to deteect a feature of it [5], so it always disabled SMACK support. Now, it does not detect xattr at all, so it doesn't enable SMACK either. So, even though we have a regression about the detections of xattr.h, we have no regression in functionality.

Now, let's see some test-pkg configs and results:

    $ cat attr-nommu.cfg
    BR2_PACKAGE_ACL=y
    BR2_PACKAGE_ATTR=y
    BR2_PACKAGE_LIBARCHIVE=y
    BR2_PACKAGE_MTD=y
    BR2_PACKAGE_MTD_MKFSJFFS2=y
    BR2_PACKAGE_MTD_MKFSUBIFS=y
    $ ./utils/test-pkg -c attr-nommu.cfg -d $(pwd)/test-nommu
                                 br-arm-full [1/6]: OK
                      br-arm-cortex-a9-glibc [2/6]: OK
                       br-arm-cortex-m4-full [3/6]: OK
                              br-x86-64-musl [4/6]: OK
                          br-arm-full-static [5/6]: OK
                    armv5-ctng-linux-gnueabi [6/6]: OK
    6 builds, 0 skipped, 0 build failed, 0 legal-info failed
    $ cat attr-mmu.cfg
    BR2_PACKAGE_ACL=y
    BR2_PACKAGE_ATTR=y
    BR2_PACKAGE_COREUTILS=y
    BR2_PACKAGE_LIBARCHIVE=y
    BR2_PACKAGE_LOGROTATE=y
    BR2_PACKAGE_MTD=y
    BR2_PACKAGE_MTD_MKFSJFFS2=y
    BR2_PACKAGE_MTD_MKFSUBIFS=y
    BR2_PACKAGE_NETATALK=y
    BR2_PACKAGE_PATCH=y
    BR2_PACKAGE_RPM=y
    BR2_PACKAGE_RSYNC=y
    BR2_PACKAGE_SAMBA4=y
    BR2_PACKAGE_TAR=y
    BR2_PACKAGE_VIM=y
    BR2_PACKAGE_XORRISO=y
    $ ./utils/test-pkg -c attr-mmu.cfg -d $(pwd)/test-mmu
                                 br-arm-full [1/6]: OK
                      br-arm-cortex-a9-glibc [2/6]: OK
                       br-arm-cortex-m4-full [3/6]: SKIPPED
                              br-x86-64-musl [4/6]: SKIPPED
                          br-arm-full-static [5/6]: SKIPPED
                    armv5-ctng-linux-gnueabi [6/6]: OK
    6 builds, 3 skipped, 0 build failed, 0 legal-info failed

Notes:
- for mtd, the two utilities that use xattr are explcitly enabled;
- for br-arm-cortex-m4-full, that's because it is a static build, so a lot of packages are disabled;
- for br-x86-64-musl, samba4 is not available for musl;
- for br-arm-full-static, again it is a static build.

$ cat attr-mmu-glibc.cfg
BR2_PACKAGE_ACL=y
BR2_PACKAGE_ATTR=y
BR2_PACKAGE_COREUTILS=y
BR2_PACKAGE_LIBARCHIVE=y
BR2_PACKAGE_LUA=y
BR2_PACKAGE_LUA_FLU=y
BR2_PACKAGE_LOGROTATE=y
BR2_PACKAGE_MTD=y
BR2_PACKAGE_MTD_MKFSJFFS2=y
BR2_PACKAGE_MTD_MKFSUBIFS=y
BR2_PACKAGE_NETATALK=y
BR2_PACKAGE_PATCH=y
BR2_PACKAGE_RPM=y
BR2_PACKAGE_RSYNC=y
BR2_PACKAGE_SAMBA4=y
BR2_PACKAGE_STRESS_NG=y
BR2_PACKAGE_TAR=y
BR2_PACKAGE_VIM=y
BR2_PACKAGE_XORRISO=y
$ ./utils/test-pkg -c attr-mmu-glibc.cfg -d $(pwd)/test-mmu-glibc
br-arm-full [1/6]: SKIPPED
br-arm-cortex-a9-glibc [2/6]: OK
br-arm-cortex-m4-full [3/6]: SKIPPED
br-x86-64-musl [4/6]: SKIPPED
br-arm-full-static [5/6]: SKIPPED
armv5-ctng-linux-gnueabi [6/6]: OK
6 builds, 4 skipped, 0 build failed, 0 legal-info failed

Notes:
- br-arm-full: stress-ng only for glibc;
- br-arm-cortex-m4-full: it's a static build;
- br-x86-64-musl: stress-ng and smaba4 not avail on musl;
- br-arm-full-static: static build

Now, I also build-tested systemd with a custom config (not with test-pkg).

[0] https://bugs.busybox.net/show_bug.cgi?id=10986
[1] https://git.savannah.gnu.org/cgit/attr.git/commit/?id=7921157890d07858d092f4003ca4c6bae9fd2c38)
[2] glibc: since 2.5: https://sourceware.org/git/?p=glibc.git;a=commit;h=0ecb606cb6cf65de1d9fc8a919bceb4be476c602
[3] uClibc: since 2004: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=d503d1d6c62506ba6fb51c04a9703039e71d11a9
[4] musl: since 2012 (a year after initial release): http://git.musl-libc.org/cgit/musl/commit/?id=207460d09742304941f1a010a89fc2efa46bcb29
[5] checking for XATTR_NAME_SMACKEXEC in linux/xattr.h... no
[6] lua-flu applied the patch; additional patch in preparation
[7] stress-ng applied a different patch, which is dubious, and more
discussion on it
[8] xorriso has seen our patches before I could submit them, needs some
work to accomodate their git trees

Regards,
Yann E. MORIN.

The following changes since commit 78af2a63625a0893259ceb2f6cfb5b6ab1431419

package/gcc: backport arm acle bugfix 81497 (2018-06-28 23:13:50 +0200)

are available in the git repository at:

git://git.buildroot.org/~ymorin/git/buildroot.git

for you to fetch changes up to 166f3279947186301770fa28116bb6d288ee8601

package/attr: bump version (2018-06-30 16:20:03 +0200)

----------------------------------------------------------------
Yann E. MORIN (5):
package/lua-flu: fix to use the system xattr header package/stress-ng: bump version package/xorriso: fix to use the system xattr header package/acl: bump version
package/attr: bump version

 package/acl/0001-support-static-installation.patch |  29 --
 ...2-add-__acl_-prefixes-to-internal-symbols.patch | 292 ---------------------
 ...-all-use-install-1-to-install-executables.patch |  67 -----
 package/acl/acl.hash                               |   2 +-
 package/acl/acl.mk                                 |  50 +---
 .../attr/0001-support-static-installation.patch    |  29 --
 .../0002-avoid-glibc-specific-decls-defines.patch  |  37 ---
 package/attr/0003-portability-fixes.patch          |  37 ---
 ...-all-use-install-1-to-install-executables.patch |  67 -----
 package/attr/attr.hash                             |   2 +-
 package/attr/attr.mk                               |  38 +--
 package/lua-flu/0001-use-system-xattr-h.patch      | 169 ++++++++++++
 package/stress-ng/stress-ng.hash                   |   2 +-
 package/stress-ng/stress-ng.mk                     |   3 +-
 package/xorriso/0001-use-sys-xattr.h.patch         |  33 +++
 package/xorriso/xorriso.mk                         |  13 +
 16 files changed, 232 insertions(+), 638 deletions(-)
 delete mode 100644 package/acl/0001-support-static-installation.patch
 delete mode 100644 package/acl/0002-add-__acl_-prefixes-to-internal-symbols.patch
 delete mode 100644 package/acl/0003-all-use-install-1-to-install-executables.patch
 delete mode 100644 package/attr/0001-support-static-installation.patch
 delete mode 100644 package/attr/0002-avoid-glibc-specific-decls-defines.patch
 delete mode 100644 package/attr/0003-portability-fixes.patch
 delete mode 100644 package/attr/0004-all-use-install-1-to-install-executables.patch
 create mode 100644 package/lua-flu/0001-use-system-xattr-h.patch
 create mode 100644 package/xorriso/0001-use-sys-xattr.h.patch
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.  |
'------------------------------^-------^------------------^--------------------'
author
#1 lore raw

PATCH v2 1/5 package/lua-flu: fix to use the system xattr header

We can't carry a mercurial patch, because the luarocks package is not organised with the same layout as the upstream package source tree is.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Marcin Niestroj <[email protected]>
Cc Francois Perrad <[email protected]>

---
Changes v1 -> v2:
- explain ENOATTR -> ENODATA conversion (Thomas)
- explain why it's not a hg patch (Thomas)
- reference upstream PR and commit

---
 package/lua-flu/0001-use-system-xattr-h.patch | 169 ++++++++++++++++++++++++++
 1 file changed, 169 insertions(+)
 create mode 100644 package/lua-flu/0001-use-system-xattr-h.patch
package/lua-flu/0001-use-system-xattr-h.patch new file +169 -0
new file mode 100644
index 0000000000..1cd44b4617
@@ -0,0 +1,169 @@
+Use system <sys/xattr.h>
+
+The one from attr is no longer installed with latest version.
+
+ENOATTR was in fact defined as ENODATA, so switch to using that instead.
+
+Signed-off-by: "Yann E. MORIN" <[email protected]>
+
+---
+Upstream status: merged:
+    https://bitbucket.org/doub/flu/pull-requests/1
+    https://bitbucket.org/doub/flu/commits/2d75cc2be79026b94188b11c6f53b219c24a5f70
+
+
+diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/doc.lua lua-flu-20150331-1/doub-flu-a7daae986339/doc/doc.lua
+--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/doc.lua	2015-03-31 18:54:19.000000000 +0200
++++ lua-flu-20150331-1/doub-flu-a7daae986339/doc/doc.lua	2018-05-06 09:22:28.499324049 +0200
+@@ -327,7 +327,7 @@
+ 				name = "fs.getxattr";
+ 				parameters = {"path", "name"};
+ 				results = {"value"};
+-				doc = [[Get an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown.]];
++				doc = [[Get an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown.]];
+ 			},
+ 			{
+ 				name = "fs.listxattr";
+@@ -338,7 +338,7 @@
+ 			{
+ 				name = "fs.removexattr";
+ 				parameters = {"path", "name"};
+-				doc = [[Remove an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown.]];
++				doc = [[Remove an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown.]];
+ 			},
+ 			{
+ 				name = "fs.opendir";
+diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/luafs.lua lua-flu-20150331-1/doub-flu-a7daae986339/doc/luafs.lua
+--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/luafs.lua	2015-03-31 18:54:19.000000000 +0200
++++ lua-flu-20150331-1/doub-flu-a7daae986339/doc/luafs.lua	2018-05-06 09:22:28.495324054 +0200
+@@ -222,8 +222,8 @@
+ -- :NOTE: since the filesystem is a pure tree (not a DAG), use the path to find attribs
+ 
+ function luafs.getxattr(path, name)
+-	local attrs = assert(xattrs[path], errno.ENOATTR)
+-	return assert(attrs[name], errno.ENOATTR)
++	local attrs = assert(xattrs[path], errno.ENODATA)
++	return assert(attrs[name], errno.ENODATA)
+ end
+ 
+ function luafs.setxattr(path, name, value, flags)
+@@ -236,7 +236,7 @@
+ end
+ 
+ function luafs.removexattr(path, name)
+-	local attrs = assert(xattrs[path], errno.ENOATTR)
++	local attrs = assert(xattrs[path], errno.ENODATA)
+ 	attrs[name] = nil
+ 	if next(attrs)==nil then
+ 		xattrs[path] = nil
+diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/manual.html lua-flu-20150331-1/doub-flu-a7daae986339/doc/manual.html
+--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/doc/manual.html	2015-03-31 18:54:19.000000000 +0200
++++ lua-flu-20150331-1/doub-flu-a7daae986339/doc/manual.html	2018-05-06 09:22:28.499324049 +0200
+@@ -347,7 +347,7 @@
+ 		<div class="function">
+ 		<h3><a name="fs.getxattr"><code>value = fs.getxattr (path, name)</code></a></h3>
+ 
+-<p>Get an extended attribute. If the attribute doesn't exist <code>ENOATTR</code> should be thrown.</p>
++<p>Get an extended attribute. If the attribute doesn't exist <code>ENODATA</code> should be thrown.</p>
+ 		</div>
+ 
+ 		<div class="function">
+@@ -359,7 +359,7 @@
+ 		<div class="function">
+ 		<h3><a name="fs.removexattr"><code>fs.removexattr (path, name)</code></a></h3>
+ 
+-<p>Remove an extended attribute. If the attribute doesn't exist <code>ENOATTR</code> should be thrown.</p>
++<p>Remove an extended attribute. If the attribute doesn't exist <code>ENODATA</code> should be thrown.</p>
+ 		</div>
+ 
+ 		<div class="function">
+diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/errno.c lua-flu-20150331-1/doub-flu-a7daae986339/errno.c
+--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/errno.c	2015-03-31 18:54:19.000000000 +0200
++++ lua-flu-20150331-1/doub-flu-a7daae986339/errno.c	2018-05-06 09:23:06.323282527 +0200
+@@ -3,7 +3,7 @@
+ #include <lua.h>
+ #include <lauxlib.h>
+ #include <stdlib.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #include "compat.h"
+ 
+ /****************************************************************************/
+@@ -103,7 +103,7 @@
+ 	REGISTER_ERROR(EDOM)
+ 	REGISTER_ERROR(ERANGE)
+ 	REGISTER_ERROR(ENOSYS)
+-	REGISTER_ERROR(ENOATTR)
++	REGISTER_ERROR(ENODATA)
+ 	#undef REGISTER_ERROR
+ }
+ 
+diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu-20150331-1.rockspec lua-flu-20150331-1/doub-flu-a7daae986339/flu-20150331-1.rockspec
+--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu-20150331-1.rockspec	2018-05-06 09:22:04.123351349 +0200
++++ lua-flu-20150331-1/doub-flu-a7daae986339/flu-20150331-1.rockspec	2018-05-06 09:23:06.323282527 +0200
+@@ -14,7 +14,7 @@
+ 		library = 'fuse',
+ 	},
+ 	ATTR = {
+-		header = 'attr/xattr.h',
++		header = 'sys/xattr.h',
+ 	},
+ }
+ dependencies = {
+diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu.c lua-flu-20150331-1/doub-flu-a7daae986339/flu.c
+--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu.c	2015-03-31 18:54:19.000000000 +0200
++++ lua-flu-20150331-1/doub-flu-a7daae986339/flu.c	2018-05-06 09:23:06.323282527 +0200
+@@ -15,7 +15,7 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <fuse.h>
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #include <lua.h>
+ #include <lauxlib.h>
+ 
+diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu.rockspec.in lua-flu-20150331-1/doub-flu-a7daae986339/flu.rockspec.in
+--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/flu.rockspec.in	2015-03-31 18:54:19.000000000 +0200
++++ lua-flu-20150331-1/doub-flu-a7daae986339/flu.rockspec.in	2018-05-06 09:23:06.323282527 +0200
+@@ -14,7 +14,7 @@
+ 		library = 'fuse',
+ 	},
+ 	ATTR = {
+-		header = 'attr/xattr.h',
++		header = 'sys/xattr.h',
+ 	},
+ }
+ dependencies = {
+diff -durN lua-flu-20150331-1.orig/doub-flu-a7daae986339/README.md lua-flu-20150331-1/doub-flu-a7daae986339/README.md
+--- lua-flu-20150331-1.orig/doub-flu-a7daae986339/README.md	2015-03-31 18:54:19.000000000 +0200
++++ lua-flu-20150331-1/doub-flu-a7daae986339/README.md	2018-05-06 09:22:28.495324054 +0200
+@@ -345,7 +345,7 @@
+ 
+ ### `value = fs.getxattr (path, name)`
+ 
+-Get an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown.
++Get an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown.
+ 
+ ---
+ 
+@@ -357,7 +357,7 @@
+ 
+ ### `fs.removexattr (path, name)`
+ 
+-Remove an extended attribute. If the attribute doesn't exist `ENOATTR` should be thrown.
++Remove an extended attribute. If the attribute doesn't exist `ENODATA` should be thrown.
+ 
+ ---
+ 
+diff -durN lua-flu-20150331-1.orig/flu-20150331-1.rockspec lua-flu-20150331-1/flu-20150331-1.rockspec
+--- lua-flu-20150331-1.orig/flu-20150331-1.rockspec	2015-04-02 23:44:11.000000000 +0200
++++ lua-flu-20150331-1/flu-20150331-1.rockspec	2018-05-06 09:23:06.323282527 +0200
+@@ -14,7 +14,7 @@
+ 		library = 'fuse',
+ 	},
+ 	ATTR = {
+-		header = 'attr/xattr.h',
++		header = 'sys/xattr.h',
+ 	},
+ }
+ dependencies = {
Signature · 1 line
2.14.1
Applied
#2 lore raw

PATCH v2 1/5 package/lua-flu: fix to use the system xattr header

Hello,

Quoted 12 lines · Yann E. MORIN

We can't carry a mercurial patch, because the luarocks package is not organised with the same layout as the upstream package source tree is.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Marcin Niestroj <[email protected]>
Cc Francois Perrad <[email protected]>

---
Changes v1 -> v2:
- explain ENOATTR -> ENODATA conversion (Thomas)
- explain why it's not a hg patch (Thomas)
- reference upstream PR and commit

Quoted 4 lines
---
 package/lua-flu/0001-use-system-xattr-h.patch | 169 ++++++++++++++++++++++++++
 1 file changed, 169 insertions(+)
 create mode 100644 package/lua-flu/0001-use-system-xattr-h.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH v2 1/5 package/lua-flu: fix to use the system xattr header

In reply to Yann E. MORIN
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

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

We can't carry a mercurial patch, because the luarocks package is not organised with the same layout as the upstream package source tree is.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Marcin Niestroj <[email protected]>
Cc Francois Perrad <[email protected]>
Quoted 5 lines

---
Changes v1 -> v2:
- explain ENOATTR -> ENODATA conversion (Thomas)
- explain why it's not a hg patch (Thomas)
- reference upstream PR and commit

Committed to 2018.05.x, thanks.

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

PATCH v2 1/5 package/lua-flu: fix to use the system xattr header

Hi Peter,

Quoted 9 lines · Peter Korsgaard
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

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

We can't carry a mercurial patch, because the luarocks package is not organised with the same layout as the upstream package source tree is.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Marcin Niestroj <[email protected]>
Cc Francois Perrad <[email protected]>
Quoted 7 lines
Quoted 5 lines

---
Changes v1 -> v2:
- explain ENOATTR -> ENODATA conversion (Thomas)
- explain why it's not a hg patch (Thomas)
- reference upstream PR and commit

Committed to 2018.05.x, thanks.

Not in 2018.05.x as of 838ed3710a149 (uclibc: ldso/arc: fix LD_DEBUG segv when printing R_ARC_NONE).

baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
#5 lore raw

PATCH v2 1/5 package/lua-flu: fix to use the system xattr header

Quoted 19 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Baruch" == Baruch Siach <[email protected]> writes:

Hi Peter,

Quoted 15 lines · Peter Korsgaard
Quoted 14 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

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

We can't carry a mercurial patch, because the luarocks package is not organised with the same layout as the upstream package source tree is.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Marcin Niestroj <[email protected]>
Cc Francois Perrad <[email protected]>

---
Changes v1 -> v2:
- explain ENOATTR -> ENODATA conversion (Thomas)
- explain why it's not a hg patch (Thomas)
- reference upstream PR and commit

Quoted 4 lines
Quoted 1 line

Committed to 2018.05.x, thanks.

Not in 2018.05.x as of 838ed3710a149 (uclibc: ldso/arc: fix LD_DEBUG segv when printing R_ARC_NONE).

It is now in both 2018.05.x and 2018.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#6 lore raw

PATCH v2 2/5 package/stress-ng: bump version

In reply to Yann E. MORIN
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Romain Naour <[email protected]>
---
 package/stress-ng/stress-ng.hash | 2 +-
 package/stress-ng/stress-ng.mk   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
package/stress-ng/stress-ng.hash +1 -1
index e735439a7e..7455288c17 100644
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256	0e1d7733b35f594f7461dedbf836bd4966d0611da4cd4e85cde4804d2a425e6d	stress-ng-0.06.15.tar.gz
+sha256  0de97212a83b2f8a34ee31ef32a7bc69066ed49ebdc59b51aa4060cb95e29321  stress-ng-0.09.32.tar.xz
package/stress-ng/stress-ng.mk +2 -1
index 794e87554e..d83240817a 100644
@@ -4,7 +4,8 @@
 #
 ################################################################################
 
-STRESS_NG_VERSION = 0.06.15
+STRESS_NG_VERSION = 0.09.32
+STRESS_NG_SOURCE = stress-ng-$(STRESS_NG_VERSION).tar.xz
 STRESS_NG_SITE = http://kernel.ubuntu.com/~cking/tarballs/stress-ng
 STRESS_NG_LICENSE = GPL-2.0+
 STRESS_NG_LICENSE_FILES = COPYING
Signature · 1 line
2.14.1
Applied
#7 lore raw

PATCH v2 2/5 package/stress-ng: bump version

Hello,

Quoted 6 lines · Yann E. MORIN
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Romain Naour <[email protected]>
---
 package/stress-ng/stress-ng.hash | 2 +-
 package/stress-ng/stress-ng.mk   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
author
#9 lore raw

PATCH v2 3/5 package/xorriso: fix to use the system xattr header

In reply to Yann E. MORIN

We don't carry a git-formatted patch, because upstream is in fact a collection of git trees, while the release tarball is an aggregate of those repositories. Thus, the layout is different between the tarball and the SCM...

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Steve Kenton <[email protected]>
---
 package/xorriso/0001-use-sys-xattr.h.patch | 33 ++++++++++++++++++++++++++++++
 package/xorriso/xorriso.mk                 | 13 ++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 package/xorriso/0001-use-sys-xattr.h.patch
package/xorriso/0001-use-sys-xattr.h.patch new file +33 -0
new file mode 100644
index 0000000000..5ae1aae72e
@@ -0,0 +1,33 @@
+Use system <sys/xattr.h>
+
+The one from attr is no longer installed with latest version.
+
+Signed-off-by: "Yann E. MORIN" <[email protected]>
+
+---
+Upstream status: alternate, more complex patch pending...
+
+diff -durN xorriso-1.4.6.orig/configure.ac xorriso-1.4.6/configure.ac
+--- xorriso-1.4.6.orig/configure.ac	2016-09-16 15:51:33.000000000 +0200
++++ xorriso-1.4.6/configure.ac	2018-05-06 23:45:38.377153069 +0200
+@@ -264,7 +264,7 @@
+ dnl Check whether there is the header for Linux xattr.
+ dnl If not, erase this macro which would enable use of listxattr and others
+         XATTR_DEF="-DLibisofs_with_aaip_xattR"
+-        AC_CHECK_HEADER(attr/xattr.h, AC_CHECK_LIB(c, listxattr, X= ,
++        AC_CHECK_HEADER(sys/xattr.h, AC_CHECK_LIB(c, listxattr, X= ,
+                                                    XATTR_DEF= ), XATTR_DEF= )
+     fi
+ elif test x"$LIBBURNIA_SUPP_FATTR" = xextattr
+diff -durN xorriso-1.4.6.orig/libisofs/aaip-os-linux.c xorriso-1.4.6/libisofs/aaip-os-linux.c
+--- xorriso-1.4.6.orig/libisofs/aaip-os-linux.c	2016-09-16 15:51:34.000000000 +0200
++++ xorriso-1.4.6/libisofs/aaip-os-linux.c	2018-05-06 23:47:25.764941583 +0200
+@@ -30,7 +30,7 @@
+ #endif
+ 
+ #ifdef Libisofs_with_aaip_xattR
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #endif
+ 
+
package/xorriso/xorriso.mk +13 -0
index 1f095911f8..af4e1bdace 100644
@@ -8,6 +8,19 @@ XORRISO_VERSION = 1.4.6
 XORRISO_SITE = $(BR2_GNU_MIRROR)/xorriso
 XORRISO_LICENSE = GPL-3.0+
 XORRISO_LICENSE_FILES = COPYING COPYRIGHT
+
+# 0001-use-sys-xattr.h.patch
+XORRISO_DEPENDENCIES = host-pkgconf
+XORRISO_AUTORECONF = YES
+HOST_XORRISO_AUTORECONF = YES
+
+# Make autoreconf happy
+define XORRISO_NEWS
+	touch $(@D)/NEWS
+endef
+XORRISO_POST_PATCH_HOOKS += XORRISO_NEWS
+HOST_XORRISO_POST_PATCH_HOOKS += XORRISO_NEWS
+
 # Disable everything until we actually need those features, and add the correct
 # host libraries
 HOST_XORRISO_CONF_OPTS = \
Signature · 1 line
2.14.1
#10 lore raw

PATCH v2 3/5 package/xorriso: fix to use the system xattr header

Hello,

package/xorriso/xorriso.mk XORRISO_VERSION = 1.4.6 · line 13

Quoted 2 lines · Yann E. MORIN
package/xorriso/xorriso.mk +2 -0
+# 0001-use-sys-xattr.h.patch
+XORRISO_DEPENDENCIES = host-pkgconf

Why do you need host-pkgconf ? For autoreconf to work fine ? If so, why isn't it also needed for host-xorriso ?

package/xorriso/xorriso.mk XORRISO_VERSION = 1.4.6 · line 15

Quoted 2 lines
package/xorriso/xorriso.mk +2 -0
+XORRISO_AUTORECONF = YES
+HOST_XORRISO_AUTORECONF = YES

HOST_<pkg>_AUTORECONF gets derived from <pkg>_AUTORECONF, so HOST_XORRISO_AUTORECONF = YES doesn't seem to be very useful.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
author
#11 lore raw

PATCH v2 3/5 package/xorriso: fix to use the system xattr header

Thomas, All,

On 2018-06-30 21:16 +0200, Thomas Petazzoni spake thusly:

Quoted 6 lines · Yann E. MORIN

package/xorriso/xorriso.mk XORRISO_VERSION = 1.4.6 · line 13

Quoted 3 lines
package/xorriso/xorriso.mk +2 -0
+# 0001-use-sys-xattr.h.patch
+XORRISO_DEPENDENCIES = host-pkgconf

Why do you need host-pkgconf ? For autoreconf to work fine ?

Yes. I'll update the commit log to mention that.

Quoted 2 lines

If so, why
isn't it also needed for host-xorriso ?

This is an oversight. I did not build host-xorriso alone, but after building xorriso, so I missed that. I'll fix.

Quoted 5 lines

package/xorriso/xorriso.mk XORRISO_VERSION = 1.4.6 · line 15

Quoted 2 lines
package/xorriso/xorriso.mk +2 -0
+XORRISO_AUTORECONF = YES
+HOST_XORRISO_AUTORECONF = YES

HOST_<pkg>_AUTORECONF gets derived from <pkg>_AUTORECONF, so HOST_XORRISO_AUTORECONF = YES doesn't seem to be very useful.

Yeah, I never remember which is inherited and which is not...

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.  |
'------------------------------^-------^------------------^--------------------'
Applied
#12 lore raw

PATCH v2 3/5 package/xorriso: fix to use the system xattr header

In reply to Yann E. MORIN

Hello,

Quoted 5 lines · Yann E. MORIN

We don't carry a git-formatted patch, because upstream is in fact a collection of git trees, while the release tarball is an aggregate of those repositories. Thus, the layout is different between the tarball and the SCM...

Quoted 7 lines
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Steve Kenton <[email protected]>
---
 package/xorriso/0001-use-sys-xattr.h.patch | 33 ++++++++++++++++++++++++++++++
 package/xorriso/xorriso.mk                 | 13 ++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 package/xorriso/0001-use-sys-xattr.h.patch

Applied to master after fixing the issues we have discussed in this thread. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
#13 lore raw

PATCH v2 3/5 package/xorriso: fix to use the system xattr header

Quoted 17 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Hello,

Quoted 5 lines · Yann E. MORIN

We don't carry a git-formatted patch, because upstream is in fact a collection of git trees, while the release tarball is an aggregate of those repositories. Thus, the layout is different between the tarball and the SCM...

Quoted 7 lines
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Steve Kenton <[email protected]>

---
package/xorriso/0001-use-sys-xattr.h.patch | 33 ++++++++++++++++++++++++++++++
package/xorriso/xorriso.mk | 13 ++++++++++++

2 files changed, 46 insertions(+)

create mode 100644 package/xorriso/0001-use-sys-xattr.h.patch

Quoted 2 lines

Applied to master after fixing the issues we have discussed in this thread. Thanks!

Committed to 2018.02.x and 2018.05.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#14 lore raw

PATCH v2 4/5 package/acl: bump version

In reply to Yann E. MORIN

Of most interest is the build system overhaul, and the drop of the dependency on attr-provided <attr/xattr.h> in favour of the system-provided <sys/xattr.h>.

That last bit meaning that we will be able to bump attr.

We can drop our patches: static is now natively supported thanks to the use of libtool, and the internal symbols patch was a backport, and finally, our install patch is superseded by the use of autotools.

The option to disable NLS has changed, so update accordingly.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Yegor Yefremov <[email protected]>
---
 package/acl/0001-support-static-installation.patch |  29 --
 ...2-add-__acl_-prefixes-to-internal-symbols.patch | 292 ---------------------
 ...-all-use-install-1-to-install-executables.patch |  67 -----
 package/acl/acl.hash                               |   2 +-
 package/acl/acl.mk                                 |  50 +---
 5 files changed, 8 insertions(+), 432 deletions(-)
 delete mode 100644 package/acl/0001-support-static-installation.patch
 delete mode 100644 package/acl/0002-add-__acl_-prefixes-to-internal-symbols.patch
 delete mode 100644 package/acl/0003-all-use-install-1-to-install-executables.patch
package/acl/0001-support-static-installation.patch deleted +0 -29
deleted file mode 100644
index 4cb473ffc2..0000000000
@@ -1,29 +0,0 @@
-Support installation of .a file when doing static linking
-
-When doing static linking (i.e ENABLE_SHARED != yes), the acl build
-logic wasn't installing any library at all, not even the .a file which
-is needed for static linking. This patch fixes that.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-
-Index: b/include/buildmacros
-===================================================================
---- a/include/buildmacros
-+++ b/include/buildmacros
-@@ -97,7 +97,15 @@
- 
- INSTALL_LTLIB_STATIC = \
- 	cd $(TOPDIR)/$(LIBNAME)/.libs; \
--	../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR);
-+	../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
-+	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).la $(PKG_DEVLIB_DIR); \
-+	../$(INSTALL) -m 644 $(LIBNAME).la $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
-+	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-+	../$(INSTALL) -T so_base $(LIBNAME).la $(PKG_LIB_DIR); \
-+	if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
-+	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
-+	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
-+	fi
- 
- INSTALL_MAN = \
- 	@for d in $(MAN_PAGES); do \
package/acl/0002-add-__acl_-prefixes-to-internal-symbols.patch deleted +0 -292

292 lines not on this page · raw message

package/acl/0003-all-use-install-1-to-install-executables.patch deleted +0 -67

67 lines not on this page · raw message

package/acl/acl.hash +1 -1
index 3f9d7900d3..091092a1c5 100644
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23	acl-2.2.52.src.tar.gz
+sha256  06be9865c6f418d851ff4494e12406568353b891ffe1f596b34693c387af26c7  acl-2.2.53.tar.gz
package/acl/acl.mk +7 -43

61 lines not on this page · raw message

Signature · 1 line
2.14.1
Applied
#15 lore raw

PATCH v2 4/5 package/acl: bump version

Quoted 6 lines · Yann E. MORIN

Of most interest is the build system overhaul, and the drop of the dependency on attr-provided <attr/xattr.h> in favour of the system-provided <sys/xattr.h>.

That last bit meaning that we will be able to bump attr.

Quoted 8 lines

We can drop our patches: static is now natively supported thanks to the use of libtool, and the internal symbols patch was a backport, and finally, our install patch is superseded by the use of autotools.

The option to disable NLS has changed, so update accordingly.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Yegor Yefremov <[email protected]>

Applied to master, thanks.

Regards,
Arnout

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
#16 lore raw

PATCH v2 4/5 package/acl: bump version

In reply to Yann E. MORIN
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

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

Of most interest is the build system overhaul, and the drop of the dependency on attr-provided <attr/xattr.h> in favour of the system-provided <sys/xattr.h>.

That last bit meaning that we will be able to bump attr.

Quoted 8 lines

We can drop our patches: static is now natively supported thanks to the use of libtool, and the internal symbols patch was a backport, and finally, our install patch is superseded by the use of autotools.

The option to disable NLS has changed, so update accordingly.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Yegor Yefremov <[email protected]>

Committed to 2018.02.x and 2018.05.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard
author
#17 lore raw

PATCH v2 5/5 package/attr: bump version

In reply to Yann E. MORIN

The current version of attr uses a canned custom buildsystem, that is borked in quite a few ways (no support for static, overwrites destination files without unlinking...)

There has been a release recently-ish, with a complete overhaul of the buildsystem. We can now drop all our patches.

The option to disable NLS has changed, so update accordingly.

Fixes #10986
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Yegor Yefremov <[email protected]>
---
 .../attr/0001-support-static-installation.patch    | 29 ----------
 .../0002-avoid-glibc-specific-decls-defines.patch  | 37 ------------
 package/attr/0003-portability-fixes.patch          | 37 ------------
 ...-all-use-install-1-to-install-executables.patch | 67 ----------------------
 package/attr/attr.hash                             |  2 +-
 package/attr/attr.mk                               | 38 ++----------
 6 files changed, 6 insertions(+), 204 deletions(-)
 delete mode 100644 package/attr/0001-support-static-installation.patch
 delete mode 100644 package/attr/0002-avoid-glibc-specific-decls-defines.patch
 delete mode 100644 package/attr/0003-portability-fixes.patch
 delete mode 100644 package/attr/0004-all-use-install-1-to-install-executables.patch
package/attr/0001-support-static-installation.patch deleted +0 -29
deleted file mode 100644
index 87858ac75e..0000000000
@@ -1,29 +0,0 @@
-Support installation of .a file when doing static linking
-
-When doing static linking (i.e ENABLE_SHARED != yes), the attr build
-logic wasn't installing any library at all, not even the .a file which
-is needed for static linking. This patch fixes that.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-
-Index: b/include/buildmacros
-===================================================================
---- a/include/buildmacros
-+++ b/include/buildmacros
-@@ -97,7 +97,15 @@
- 
- INSTALL_LTLIB_STATIC = \
- 	cd $(TOPDIR)/$(LIBNAME)/.libs; \
--	../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR);
-+	../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \
-+	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).la $(PKG_DEVLIB_DIR); \
-+	../$(INSTALL) -m 644 $(LIBNAME).la $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \
-+	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-+	../$(INSTALL) -T so_base $(LIBNAME).la $(PKG_LIB_DIR); \
-+	if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \
-+	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \
-+	../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \
-+	fi
- 
- INSTALL_MAN = \
- 	@for d in $(MAN_PAGES); do \
package/attr/0002-avoid-glibc-specific-decls-defines.patch deleted +0 -37
deleted file mode 100644
index 8c71678cf4..0000000000
@@ -1,37 +0,0 @@
-From 667137acaffb8d0cc62b47821a67a52ba0637d5c Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <[email protected]>
-Date: Fri, 10 Jan 2014 13:56:37 +0000
-Subject: avoid glibc-specific DECLS defines
-
-This matches what we do in all the other headers.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
-diff --git a/include/xattr.h b/include/xattr.h
-index 70a84be..070d7c5 100644
---- a/include/xattr.h
-+++ b/include/xattr.h
-@@ -30,8 +30,9 @@
- #define XATTR_CREATE  0x1       /* set value, fail if attr already exists */
- #define XATTR_REPLACE 0x2       /* set value, fail if attr does not exist */
- 
--
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- 
- extern int setxattr (const char *__path, const char *__name,
- 		      const void *__value, size_t __size, int __flags) __THROW;
-@@ -58,6 +59,8 @@ extern int removexattr (const char *__path, const char *__name) __THROW;
- extern int lremovexattr (const char *__path, const char *__name) __THROW;
- extern int fremovexattr (int __filedes,   const char *__name) __THROW;
- 
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
- 
- #endif	/* __XATTR_H__ */
---
-cgit v0.9.0.2
package/attr/0003-portability-fixes.patch deleted +0 -37
deleted file mode 100644
index c5dc8c865b..0000000000
@@ -1,37 +0,0 @@
-From 92247401984dd9a80d9d0c8c030692323f980678 Mon Sep 17 00:00:00 2001
-From: Emmanuel Dreyfus <[email protected]>
-Date: Mon, 30 Jun 2014 13:06:05 +0000
-Subject: Portability fixes
-
-- <features.h>  is Linux specific
-- Define __THROW for non glibc based systems
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
-(limited to 'include/xattr.h')
-
-diff --git a/include/xattr.h b/include/xattr.h
-index 070d7c5..fd1f268 100644
---- a/include/xattr.h
-+++ b/include/xattr.h
-@@ -20,7 +20,18 @@
- #ifndef __XATTR_H__
- #define __XATTR_H__
- 
-+#if defined(linux)
- #include <features.h>
-+#endif
-+
-+/* Portability non glibc c++ build systems */
-+#ifndef __THROW
-+# if defined __cplusplus
-+#  define __THROW       throw ()
-+# else
-+#  define __THROW
-+# endif
-+#endif
- 
- #include <errno.h>
- #ifndef ENOATTR
---
-cgit v0.9.0.2
package/attr/0004-all-use-install-1-to-install-executables.patch deleted +0 -67

67 lines not on this page · raw message

package/attr/attr.hash +1 -1
index d2d1c2ed50..88adf44e6a 100644
@@ -1,2 +1,2 @@
 # Locally calculated after checking pgp signature
-sha256	25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859	attr-2.4.47.src.tar.gz
+sha256  5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7  attr-2.4.48.tar.gz
package/attr/attr.mk +5 -33
index 8d250608b7..a0cc26bab2 100644
@@ -4,43 +4,15 @@
 #
 ################################################################################
 
-ATTR_VERSION = 2.4.47
-ATTR_SOURCE = attr-$(ATTR_VERSION).src.tar.gz
-ATTR_SITE = http://download.savannah.gnu.org/releases/attr
-ATTR_INSTALL_STAGING = YES
-ATTR_CONF_OPTS = --enable-gettext=no
-HOST_ATTR_CONF_OPTS = --enable-gettext=no
+ATTR_VERSION = 2.4.48
+ATTR_SITE = https://mirrors.up.pt/pub/nongnu/attr
 ATTR_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries)
 ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL
 
-# While the configuration system uses autoconf, the Makefiles are
-# hand-written and do not use automake. Therefore, we have to hack
-# around their deficiencies by passing installation paths.
-ATTR_INSTALL_STAGING_OPTS = \
-	prefix=$(STAGING_DIR)/usr \
-	exec_prefix=$(STAGING_DIR)/usr \
-	PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \
-	install-dev install-lib
+ATTR_INSTALL_STAGING = YES
 
-ATTR_INSTALL_TARGET_OPTS = \
-	prefix=$(TARGET_DIR)/usr \
-	exec_prefix=$(TARGET_DIR)/usr \
-	install install-lib
-
-HOST_ATTR_INSTALL_OPTS = \
-	prefix=$(HOST_DIR) \
-	exec_prefix=$(HOST_DIR) \
-	install-dev install-lib
-
-# The libdir variable in libattr.la is empty, so let's fix it. This is
-# probably due to attr not using automake, and not doing fully the
-# right thing with libtool.
-define ATTR_FIX_LIBTOOL_LA_LIBDIR
-	$(SED) "s,libdir=.*,libdir='$(STAGING_DIR)'," \
-		$(STAGING_DIR)/usr/lib/libattr.la
-endef
-
-ATTR_POST_INSTALL_STAGING_HOOKS += ATTR_FIX_LIBTOOL_LA_LIBDIR
+ATTR_CONF_OPTS = --disable-nls
+HOST_ATTR_CONF_OPTS = --disable-nls
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))
Signature · 1 line
2.14.1
#18 lore raw

PATCH v2 5/5 package/attr: bump version

Quoted 14 lines · Yann E. MORIN

The current version of attr uses a canned custom buildsystem, that is borked in quite a few ways (no support for static, overwrites destination files without unlinking...)

There has been a release recently-ish, with a complete overhaul of the buildsystem. We can now drop all our patches.

The option to disable NLS has changed, so update accordingly.

Fixes #10986
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Yegor Yefremov <[email protected]>

---

[snip]

package/attr/attr.mk line 8

Quoted 2 lines
package/attr/attr.mk +1 -1
-ATTR_SITE = http://download.savannah.gnu.org/releases/attr
+ATTR_SITE = https://mirrors.up.pt/pub/nongnu/attr

This must have been a mistake, so I reverted to the original site of the
specific mirror and applied to master, thanks.

Regards,
Arnout

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
#19 lore raw

PATCH v2 5/5 package/attr: bump version

In reply to Yann E. MORIN
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

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

The current version of attr uses a canned custom buildsystem, that is borked in quite a few ways (no support for static, overwrites destination files without unlinking...)

There has been a release recently-ish, with a complete overhaul of the buildsystem. We can now drop all our patches.

Quoted 6 lines

The option to disable NLS has changed, so update accordingly.

Fixes #10986
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Yegor Yefremov <[email protected]>

Committed to 2018.02.x and 2018.05.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard