* [Buildroot] [PATCH 1/4] package/pseudo: needs sqlite
2016-11-03 22:21 [Buildroot] [PATCH 0/4] core: fix pseudo, definitely get rid of fakeroot Yann E. MORIN
@ 2016-11-03 22:21 ` Yann E. MORIN
2016-11-03 22:34 ` Thomas Petazzoni
2016-11-03 22:21 ` [Buildroot] [PATCH 2/4] fs/iso9660: use pseudo instead of fakeroot Yann E. MORIN
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Yann E. MORIN @ 2016-11-03 22:21 UTC (permalink / raw)
To: buildroot
pseudo uses sqlite to store its state.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/pseudo/pseudo.mk | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/package/pseudo/pseudo.mk b/package/pseudo/pseudo.mk
index 314fa82..ffa6e58 100644
--- a/package/pseudo/pseudo.mk
+++ b/package/pseudo/pseudo.mk
@@ -12,4 +12,9 @@ PSEUDO_SITE_METHOD = git
PSEUDO_LICENSE = LGPLv2.1
PSEUDO_LICENSE_FILES = COPYING
+HOST_PSEUDO_DEPENDENCIES = host-sqlite
+HOST_PSEUDO_CONF_OPTS = \
+ --libdir=$(HOST_DIR)/usr/lib \
+ --with-sqlite=$(HOST_DIR)/usr
+
$(eval $(host-autotools-package))
--
2.7.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [Buildroot] [PATCH 1/4] package/pseudo: needs sqlite
2016-11-03 22:21 ` [Buildroot] [PATCH 1/4] package/pseudo: needs sqlite Yann E. MORIN
@ 2016-11-03 22:34 ` Thomas Petazzoni
0 siblings, 0 replies; 9+ messages in thread
From: Thomas Petazzoni @ 2016-11-03 22:34 UTC (permalink / raw)
To: buildroot
Hello,
On Thu, 3 Nov 2016 23:21:05 +0100, Yann E. MORIN wrote:
> +HOST_PSEUDO_DEPENDENCIES = host-sqlite
> +HOST_PSEUDO_CONF_OPTS = \
> + --libdir=$(HOST_DIR)/usr/lib \
> + --with-sqlite=$(HOST_DIR)/usr
I've added a comment above this to explain why we pass --libdir even
though this shouldn't be needed for autotools packages.
However, the fact that pseudo doesn't use a real autoconf configure
script also means that it shouldn't be using the autotools-package
infra: it should use the generic-package infra. Something to fix in a
follow-up patch.
Applied with the comment added, thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 2/4] fs/iso9660: use pseudo instead of fakeroot
2016-11-03 22:21 [Buildroot] [PATCH 0/4] core: fix pseudo, definitely get rid of fakeroot Yann E. MORIN
2016-11-03 22:21 ` [Buildroot] [PATCH 1/4] package/pseudo: needs sqlite Yann E. MORIN
@ 2016-11-03 22:21 ` Yann E. MORIN
2016-11-03 22:35 ` Thomas Petazzoni
2016-11-03 22:21 ` [Buildroot] [PATCH 3/4] package/pseudo: add a legacy symlink to emulate fakeroot Yann E. MORIN
2016-11-03 22:21 ` [Buildroot] [PATCH 4/4] package/fakeroot: remove Yann E. MORIN
3 siblings, 1 reply; 9+ messages in thread
From: Yann E. MORIN @ 2016-11-03 22:21 UTC (permalink / raw)
To: buildroot
We're dropping fakeroot in favour of pseudo, now.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
fs/iso9660/iso9660.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk
index 32d79d7..c9af4bd 100644
--- a/fs/iso9660/iso9660.mk
+++ b/fs/iso9660/iso9660.mk
@@ -24,7 +24,7 @@
ROOTFS_ISO9660_BOOT_MENU = $(call qstrip,$(BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU))
-ROOTFS_ISO9660_DEPENDENCIES = host-cdrkit host-fakeroot linux
+ROOTFS_ISO9660_DEPENDENCIES = host-cdrkit host-pseudo linux
ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
ROOTFS_ISO9660_USE_INITRD = YES
--
2.7.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 2/4] fs/iso9660: use pseudo instead of fakeroot
2016-11-03 22:21 ` [Buildroot] [PATCH 2/4] fs/iso9660: use pseudo instead of fakeroot Yann E. MORIN
@ 2016-11-03 22:35 ` Thomas Petazzoni
0 siblings, 0 replies; 9+ messages in thread
From: Thomas Petazzoni @ 2016-11-03 22:35 UTC (permalink / raw)
To: buildroot
Hello,
On Thu, 3 Nov 2016 23:21:06 +0100, Yann E. MORIN wrote:
> We're dropping fakeroot in favour of pseudo, now.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> fs/iso9660/iso9660.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/iso9660/iso9660.mk b/fs/iso9660/iso9660.mk
> index 32d79d7..c9af4bd 100644
> --- a/fs/iso9660/iso9660.mk
> +++ b/fs/iso9660/iso9660.mk
> @@ -24,7 +24,7 @@
>
> ROOTFS_ISO9660_BOOT_MENU = $(call qstrip,$(BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU))
>
> -ROOTFS_ISO9660_DEPENDENCIES = host-cdrkit host-fakeroot linux
> +ROOTFS_ISO9660_DEPENDENCIES = host-cdrkit host-pseudo linux
In fact, this dependency on host-fakeroot is redundant, since iso9660
was converted a while ago to use the common fs infra. So I've dropped
this bogus dependency instead of applying your patch.
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 3/4] package/pseudo: add a legacy symlink to emulate fakeroot
2016-11-03 22:21 [Buildroot] [PATCH 0/4] core: fix pseudo, definitely get rid of fakeroot Yann E. MORIN
2016-11-03 22:21 ` [Buildroot] [PATCH 1/4] package/pseudo: needs sqlite Yann E. MORIN
2016-11-03 22:21 ` [Buildroot] [PATCH 2/4] fs/iso9660: use pseudo instead of fakeroot Yann E. MORIN
@ 2016-11-03 22:21 ` Yann E. MORIN
2016-11-03 22:35 ` Thomas Petazzoni
2016-11-03 22:21 ` [Buildroot] [PATCH 4/4] package/fakeroot: remove Yann E. MORIN
3 siblings, 1 reply; 9+ messages in thread
From: Yann E. MORIN @ 2016-11-03 22:21 UTC (permalink / raw)
To: buildroot
In cae some post-image script want to call fakeroot, add a symlink to
use pseudo instead.
Reported-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/pseudo/pseudo.mk | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/package/pseudo/pseudo.mk b/package/pseudo/pseudo.mk
index ffa6e58..b4f2df3 100644
--- a/package/pseudo/pseudo.mk
+++ b/package/pseudo/pseudo.mk
@@ -17,4 +17,9 @@ HOST_PSEUDO_CONF_OPTS = \
--libdir=$(HOST_DIR)/usr/lib \
--with-sqlite=$(HOST_DIR)/usr
+define HOST_PSEUDO_FAKEROOT_SYMLINK
+ ln -sf pseudo $(HOST_DIR)/usr/bin/fakeroot
+endef
+HOST_PSEUDO_POST_INSTALL_HOOKS += HOST_PSEUDO_FAKEROOT_SYMLINK
+
$(eval $(host-autotools-package))
--
2.7.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 4/4] package/fakeroot: remove
2016-11-03 22:21 [Buildroot] [PATCH 0/4] core: fix pseudo, definitely get rid of fakeroot Yann E. MORIN
` (2 preceding siblings ...)
2016-11-03 22:21 ` [Buildroot] [PATCH 3/4] package/pseudo: add a legacy symlink to emulate fakeroot Yann E. MORIN
@ 2016-11-03 22:21 ` Yann E. MORIN
2016-11-03 22:35 ` Thomas Petazzoni
3 siblings, 1 reply; 9+ messages in thread
From: Yann E. MORIN @ 2016-11-03 22:21 UTC (permalink / raw)
To: buildroot
We've now entirely switched to using pseudo istead of fakeroot, so it is
time to remove the fakeroot package now.
Reported-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/fakeroot/0001-hide-dlsym-error.patch | 34 ----------------------------
package/fakeroot/fakeroot.hash | 4 ----
package/fakeroot/fakeroot.mk | 20 ----------------
3 files changed, 58 deletions(-)
delete mode 100644 package/fakeroot/0001-hide-dlsym-error.patch
delete mode 100644 package/fakeroot/fakeroot.hash
delete mode 100644 package/fakeroot/fakeroot.mk
diff --git a/package/fakeroot/0001-hide-dlsym-error.patch b/package/fakeroot/0001-hide-dlsym-error.patch
deleted file mode 100644
index 2c61fab..0000000
--- a/package/fakeroot/0001-hide-dlsym-error.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Hide error from dlsym()
- dlsym(), starting in glibc 2.24 actually reports errors. In our case,
- we try to get ACL functions which are not in the glibc. This causes
- failures in test suites, so hide those messages for non-debugging
- purposes for now. It also makes the build logs annoying to read.
-Author: Julian Andres Klode <juliank@ubuntu.com>
-Origin: vendor
-Bug-Debian: https://bugs.debian.org/830912
-Forwarded: no
-Last-Update: 2016-08-12
-
-Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
-
---- a/libfakeroot.c
-+++ b/libfakeroot.c
-@@ -256,10 +256,16 @@ void load_library_symbols(void){
- /* clear dlerror() just in case dlsym() legitimately returns NULL */
- msg = dlerror();
- *(next_wrap[i].doit)=dlsym(get_libc(), next_wrap[i].name);
-+
- if ( (msg = dlerror()) != NULL){
-- fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg);
--/* abort ();*/
-+#ifdef LIBFAKEROOT_DEBUGGING
-+ if (fakeroot_debug) {
-+ fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg);
-+/* abort ();*/
-+ }
-+#endif
- }
-+
- }
- }
-
diff --git a/package/fakeroot/fakeroot.hash b/package/fakeroot/fakeroot.hash
deleted file mode 100644
index f0d436e..0000000
--- a/package/fakeroot/fakeroot.hash
+++ /dev/null
@@ -1,4 +0,0 @@
-# From http://snapshot.debian.org/package/fakeroot/1.20.2-1/
-sha1 367040df07043edb630942b21939e493f3fad888 fakeroot_1.20.2.orig.tar.bz2
-# Calculated based on the hash above
-sha256 7c0a164d19db3efa9e802e0fc7cdfeff70ec6d26cdbdc4338c9c2823c5ea230c fakeroot_1.20.2.orig.tar.bz2
diff --git a/package/fakeroot/fakeroot.mk b/package/fakeroot/fakeroot.mk
deleted file mode 100644
index 168cd13..0000000
--- a/package/fakeroot/fakeroot.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-################################################################################
-#
-# fakeroot
-#
-################################################################################
-
-FAKEROOT_VERSION = 1.20.2
-FAKEROOT_SOURCE = fakeroot_$(FAKEROOT_VERSION).orig.tar.bz2
-FAKEROOT_SITE = http://snapshot.debian.org/archive/debian/20141005T221953Z/pool/main/f/fakeroot
-# Force capabilities detection off
-# For now these are process capabilities (faked) rather than file
-# so they're of no real use
-HOST_FAKEROOT_CONF_ENV = \
- ac_cv_header_sys_capability_h=no \
- ac_cv_func_capset=no
-
-FAKEROOT_LICENSE = GPLv3+
-FAKEROOT_LICENSE_FILES = COPYING
-
-$(eval $(host-autotools-package))
--
2.7.4
^ permalink raw reply related [flat|nested] 9+ messages in thread* [Buildroot] [PATCH 4/4] package/fakeroot: remove
2016-11-03 22:21 ` [Buildroot] [PATCH 4/4] package/fakeroot: remove Yann E. MORIN
@ 2016-11-03 22:35 ` Thomas Petazzoni
0 siblings, 0 replies; 9+ messages in thread
From: Thomas Petazzoni @ 2016-11-03 22:35 UTC (permalink / raw)
To: buildroot
Hello,
On Thu, 3 Nov 2016 23:21:08 +0100, Yann E. MORIN wrote:
> We've now entirely switched to using pseudo istead of fakeroot, so it is
> time to remove the fakeroot package now.
>
> Reported-by: Arnout Vandecappelle <arnout@mind.be>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> package/fakeroot/0001-hide-dlsym-error.patch | 34 ----------------------------
> package/fakeroot/fakeroot.hash | 4 ----
> package/fakeroot/fakeroot.mk | 20 ----------------
> 3 files changed, 58 deletions(-)
> delete mode 100644 package/fakeroot/0001-hide-dlsym-error.patch
> delete mode 100644 package/fakeroot/fakeroot.hash
> delete mode 100644 package/fakeroot/fakeroot.mk
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 9+ messages in thread