initial buildroot for linux 5.15
This commit is contained in:
Huan.Feng
@@ -0,0 +1,78 @@
|
||||
From 731256d7517f0d9cf0b999bb22f864080d5e8690 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sat, 18 Jul 2020 10:00:50 +0200
|
||||
Subject: [PATCH] meson.build: fix linking with libmetadata
|
||||
|
||||
libmetadata is built as a static library and depends on libgvfscommon so
|
||||
change the dependencies order to put libgvfscommon_dep after
|
||||
libmetadata_dep or gvfsd-metadata will fail to link on:
|
||||
|
||||
FAILED: metadata/gvfsd-metadata
|
||||
/home/naourr/work/instance-3/output-1/host/bin/arm-none-linux-gnueabi-gcc -o metadata/gvfsd-metadata 'metadata/45447b7@@gvfsd-metadata@exe/meta-daemon.c.o' -Wl,--as-needed -Wl,--no-undefined -Wl,-O1 -Wl,--start-group common/libgvfscommon.so metadata/libmetadata.a /home/naourr/work/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libgio-2.0.so /home/naourr/work/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libgobject-2.0.so /home/naourr/work/instance-3/output-1/host/arm-buildroot-linux-gnueabi/sysroot/usr/lib/libglib-2.0.so -Wl,--end-group '-Wl,-rpath,$ORIGIN/../common:$ORIGIN/' -Wl,-rpath-link,/home/naourr/work/instance-3/output-1/build/gvfs-1.44.1/build/common -Wl,-rpath-link,/home/naourr/work/instance-3/output-1/build/gvfs-1.44.1/build/metadata
|
||||
metadata/libmetadata.a(metatree.c.o): In function `safe_open':
|
||||
metatree.c:(.text+0x9c8): undefined reference to `gvfs_randomize_string'
|
||||
collect2: error: ld returned 1 exit status
|
||||
|
||||
Apply this change in the whole source code and not only for
|
||||
gvfsd-metadata to avoid any other build failures.
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results//fa892c41b6b9285839a0164b000e37fb04dcc194
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status:
|
||||
https://gitlab.gnome.org/GNOME/gvfs/-/merge_requests/92]
|
||||
---
|
||||
client/meson.build | 2 +-
|
||||
metadata/meson.build | 5 +++--
|
||||
2 files changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/client/meson.build b/client/meson.build
|
||||
index 8f57d0d3..1d251481 100644
|
||||
--- a/client/meson.build
|
||||
+++ b/client/meson.build
|
||||
@@ -33,8 +33,8 @@ sources = uri_parser_sources + uri_utils + files(
|
||||
|
||||
deps = [
|
||||
gio_unix_dep,
|
||||
- libgvfscommon_dep,
|
||||
libmetadata_dep,
|
||||
+ libgvfscommon_dep,
|
||||
]
|
||||
|
||||
cflags = [
|
||||
diff --git a/metadata/meson.build b/metadata/meson.build
|
||||
index 4e120d18..5699e6f2 100644
|
||||
--- a/metadata/meson.build
|
||||
+++ b/metadata/meson.build
|
||||
@@ -72,8 +72,8 @@ libmetadata_dep = declare_dependency(
|
||||
)
|
||||
|
||||
deps = [
|
||||
- libgvfscommon_dep,
|
||||
libmetadata_dep,
|
||||
+ libgvfscommon_dep,
|
||||
]
|
||||
|
||||
if enable_gudev
|
||||
@@ -105,8 +105,8 @@ if enable_devel_utils
|
||||
app + '.c',
|
||||
include_directories: top_inc,
|
||||
dependencies: [
|
||||
- libgvfscommon_dep,
|
||||
libmetadata_dep,
|
||||
+ libgvfscommon_dep,
|
||||
],
|
||||
c_args: cflags,
|
||||
)
|
||||
@@ -119,6 +119,7 @@ if enable_devel_utils
|
||||
include_directories: top_inc,
|
||||
dependencies: [
|
||||
libmetadata_dep,
|
||||
+ libgvfscommon_dep,
|
||||
libxml_dep,
|
||||
],
|
||||
c_args: cflags,
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
config BR2_PACKAGE_GVFS
|
||||
bool "gvfs"
|
||||
depends on BR2_USE_WCHAR # glib2
|
||||
depends on BR2_USE_MMU # dbus, glib2
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, glib2
|
||||
depends on !BR2_STATIC_LIBS
|
||||
select BR2_PACKAGE_GSETTINGS_DESKTOP_SCHEMAS
|
||||
select BR2_PACKAGE_LIBGLIB2
|
||||
select BR2_PACKAGE_DBUS
|
||||
select BR2_PACKAGE_SHARED_MIME_INFO
|
||||
help
|
||||
gvfs is a userspace virtual filesystem where mount runs as a
|
||||
separate processes which you talk to via D-Bus. It also
|
||||
contains a gio module that seamlessly adds gvfs support to
|
||||
all applications using the gio API. It also supports exposing
|
||||
the gvfs mounts to non-gio applications using fuse.
|
||||
|
||||
https://wiki.gnome.org/action/show/Projects/gvfs
|
||||
|
||||
comment "gvfs needs a toolchain w/ wchar, threads, dynamic library"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
BR2_STATIC_LIBS
|
||||
@@ -0,0 +1,5 @@
|
||||
# From http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.44/gvfs-1.44.1.sha256sum
|
||||
sha256 50ef3245d1b03666a40455109169a2a1bd51419fd2d51f9fa6cfd4f89f04fb46 gvfs-1.44.1.tar.xz
|
||||
|
||||
# Hash for license file
|
||||
sha256 45cf336e2e48176993babc5aabf44437390f40e6a86a472c6abfc7ce9c035db4 COPYING
|
||||
@@ -0,0 +1,171 @@
|
||||
################################################################################
|
||||
#
|
||||
# gvfs
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GVFS_VERSION_MAJOR = 1.44
|
||||
GVFS_VERSION = $(GVFS_VERSION_MAJOR).1
|
||||
GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.xz
|
||||
GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR)
|
||||
GVFS_INSTALL_STAGING = YES
|
||||
GVFS_DEPENDENCIES = \
|
||||
host-pkgconf \
|
||||
host-libglib2 \
|
||||
dbus \
|
||||
gsettings-desktop-schemas \
|
||||
libglib2 \
|
||||
shared-mime-info \
|
||||
$(TARGET_NLS_DEPENDENCIES)
|
||||
GVFS_LICENSE = LGPL-2.0+
|
||||
GVFS_LICENSE_FILES = COPYING
|
||||
GVFS_CPE_ID_VENDOR = gnome
|
||||
|
||||
GVFS_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
|
||||
|
||||
# Most of these are missing library support
|
||||
GVFS_CONF_OPTS = \
|
||||
-Dafc=false \
|
||||
-Dgoa=false \
|
||||
-Dgoogle=false \
|
||||
-Dmtp=false \
|
||||
-Dsftp=false \
|
||||
-Dudisks2=false
|
||||
|
||||
ifeq ($(BR2_PACKAGE_AVAHI),y)
|
||||
GVFS_DEPENDENCIES += avahi
|
||||
GVFS_CONF_OPTS += -Ddnssd=true
|
||||
else
|
||||
GVFS_CONF_OPTS += -Ddnssd=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GCR),y)
|
||||
GVFS_DEPENDENCIES += gcr
|
||||
GVFS_CONF_OPTS += -Dgcr=true
|
||||
else
|
||||
GVFS_CONF_OPTS += -Dgcr=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
|
||||
GVFS_DEPENDENCIES += udev
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBGUDEV),y)
|
||||
GVFS_DEPENDENCIES += libgudev
|
||||
GVFS_CONF_OPTS += -Dgudev=true
|
||||
else
|
||||
GVFS_CONF_OPTS += -Dgudev=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBARCHIVE),y)
|
||||
GVFS_DEPENDENCIES += libarchive
|
||||
GVFS_CONF_OPTS += -Darchive=true
|
||||
else
|
||||
GVFS_CONF_OPTS += -Darchive=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBBLURAY),y)
|
||||
GVFS_DEPENDENCIES += libbluray
|
||||
GVFS_CONF_OPTS += -Dbluray=true
|
||||
else
|
||||
GVFS_CONF_OPTS += -Dbluray=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCAP)$(BR2_PACKAGE_POLKIT),yy)
|
||||
GVFS_DEPENDENCIES += libcap polkit
|
||||
GVFS_CONF_OPTS += -Dadmin=true
|
||||
else
|
||||
GVFS_CONF_OPTS += -Dadmin=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCDIO_PARANOIA)$(BR2_PACKAGE_LIBGUDEV),yy)
|
||||
GVFS_DEPENDENCIES += libcdio-paranoia libgudev
|
||||
GVFS_CONF_OPTS += -Dcdda=true
|
||||
else
|
||||
GVFS_CONF_OPTS += -Dcdda=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBFUSE3),y)
|
||||
GVFS_DEPENDENCIES += libfuse3
|
||||
GVFS_CONF_OPTS += -Dfuse=true
|
||||
else
|
||||
GVFS_CONF_OPTS += -Dfuse=false
|
||||
endif
|
||||
|
||||
# AFP support is anon-only without libgcrypt which isn't very useful
|
||||
ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
|
||||
GVFS_CONF_OPTS += \
|
||||
-Dafp=true \
|
||||
-Dgcrypt=true
|
||||
GVFS_DEPENDENCIES += libgcrypt
|
||||
else
|
||||
GVFS_CONF_OPTS += \
|
||||
-Dafp=false \
|
||||
-Dgcrypt=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBGPHOTO2)$(BR2_PACKAGE_LIBGUDEV),yy)
|
||||
GVFS_DEPENDENCIES += libgphoto2 libgudev
|
||||
GVFS_CONF_OPTS += -Dgphoto2=true
|
||||
else
|
||||
GVFS_CONF_OPTS += -Dgphoto2=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBNFS),y)
|
||||
GVFS_CONF_OPTS += -Dnfs=true
|
||||
GVFS_DEPENDENCIES += libnfs
|
||||
else
|
||||
GVFS_CONF_OPTS += -Dnfs=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBSECRET),y)
|
||||
GVFS_DEPENDENCIES += libsecret
|
||||
GVFS_CONF_OPTS += -Dkeyring=true
|
||||
else
|
||||
GVFS_CONF_OPTS += -Dkeyring=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBSOUP)$(BR2_PACKAGE_LIBXML2),yy)
|
||||
GVFS_DEPENDENCIES += libsoup libxml2
|
||||
GVFS_CONF_OPTS += -Dhttp=true
|
||||
else
|
||||
GVFS_CONF_OPTS += -Dhttp=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBUSB),y)
|
||||
GVFS_DEPENDENCIES += libusb
|
||||
GVFS_CONF_OPTS += -Dlibusb=true
|
||||
else
|
||||
GVFS_CONF_OPTS += -Dlibusb=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SAMBA4),y)
|
||||
GVFS_DEPENDENCIES += samba4
|
||||
GVFS_CONF_OPTS += -Dsmb=true
|
||||
else
|
||||
GVFS_CONF_OPTS += -Dsmb=false
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
|
||||
GVFS_DEPENDENCIES += systemd
|
||||
GVFS_CONF_OPTS += -Dlogind=true
|
||||
else
|
||||
GVFS_CONF_OPTS += \
|
||||
-Dlogind=false \
|
||||
-Dsystemduserunitdir=no \
|
||||
-Dtmpfilesdir=no
|
||||
endif
|
||||
|
||||
define GVFS_REMOVE_TARGET_SCHEMAS
|
||||
rm $(TARGET_DIR)/usr/share/glib-2.0/schemas/*.xml
|
||||
endef
|
||||
|
||||
define GVFS_COMPILE_SCHEMAS
|
||||
$(HOST_DIR)/bin/glib-compile-schemas --targetdir=$(TARGET_DIR)/usr/share/glib-2.0/schemas $(STAGING_DIR)/usr/share/glib-2.0/schemas
|
||||
endef
|
||||
|
||||
GVFS_POST_INSTALL_TARGET_HOOKS += \
|
||||
GVFS_REMOVE_TARGET_SCHEMAS \
|
||||
GVFS_COMPILE_SCHEMAS
|
||||
|
||||
$(eval $(meson-package))
|
||||
Reference in New Issue
Block a user