KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "opkg: disable the use of vfork for the host build"

Browse source 
This reverts commit 02e3c718e9.

Currently the vfork() code path in opkg is broken and relies on unsupported
ftello() / fseeko() operations on pipes - we need to restructure the code
before we can reconsider this approach.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2016-08-28 22:56:16 +02:00
parent 2ca0cdb7bf
commit d0b88b6067
2 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/system/opkg/Makefile
View file

@ -109,7 +109,7 @@ endef
Package/opkg-smime/conffiles = $(Package/opkg/conffiles) Package/opkg-smime/conffiles = $(Package/opkg/conffiles)
TARGET_CFLAGS += -ffunction-sections -fdata-sections -DOPKG_USE_VFORK=1 TARGET_CFLAGS += -ffunction-sections -fdata-sections
EXTRA_CFLAGS += $(TARGET_CPPFLAGS) EXTRA_CFLAGS += $(TARGET_CPPFLAGS)
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \

19
package/system/opkg/patches/280-use-vfork.patch
View file

@ -1,25 +1,20 @@
--- a/libbb/gz_open.c --- a/libbb/gz_open.c
+++ b/libbb/gz_open.c +++ b/libbb/gz_open.c
@@ -29,7 +29,12 @@ @@ -29,7 +29,7 @@
#include <unistd.h> #include <unistd.h>
#include "libbb.h" #include "libbb.h"
+#ifdef OPKG_USE_VFORK -static int gz_use_vfork;
+static const int gz_use_vfork = OPKG_USE_VFORK; +static const int gz_use_vfork = 1;
+#else
static int gz_use_vfork;
+#endif
+
FILE * FILE *
gz_open(FILE *compressed_file, int *pid) gz_open(FILE *compressed_file, int *pid)
@@ -38,7 +43,9 @@ gz_open(FILE *compressed_file, int *pid) @@ -38,8 +38,6 @@ gz_open(FILE *compressed_file, int *pid)
off_t floc; off_t floc;
int cfile = -1; int cfile = -1;
+#ifndef OPKG_USE_VFORK - gz_use_vfork = (getenv("OPKG_USE_VFORK") != NULL);
gz_use_vfork = (getenv("OPKG_USE_VFORK") != NULL); -
+#endif
if (gz_use_vfork) { if (gz_use_vfork) {
/* Create a new file descriptor for the input stream /* Create a new file descriptor for the input stream
* (it *must* be associated with a file), and lseek()