uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
107
pkgs/os-specific/linux/fuse/common.nix
Normal file
107
pkgs/os-specific/linux/fuse/common.nix
Normal file
|
|
@ -0,0 +1,107 @@
|
|||
{ version, sha256Hash }:
|
||||
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch
|
||||
, fusePackages, util-linux, gettext, shadow
|
||||
, meson, ninja, pkg-config
|
||||
, autoreconfHook
|
||||
, python3Packages, which
|
||||
}:
|
||||
|
||||
let
|
||||
isFuse3 = lib.hasPrefix "3" version;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "fuse";
|
||||
inherit version;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libfuse";
|
||||
repo = "libfuse";
|
||||
rev = "${pname}-${version}";
|
||||
sha256 = sha256Hash;
|
||||
};
|
||||
|
||||
preAutoreconf = "touch config.rpath";
|
||||
|
||||
patches =
|
||||
lib.optional
|
||||
(!isFuse3 && stdenv.isAarch64)
|
||||
(fetchpatch {
|
||||
url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch";
|
||||
sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa";
|
||||
})
|
||||
++ (if isFuse3
|
||||
then [ ./fuse3-install.patch ./fuse3-Do-not-set-FUSERMOUNT_DIR.patch ]
|
||||
else [
|
||||
./fuse2-Do-not-set-FUSERMOUNT_DIR.patch
|
||||
(fetchpatch {
|
||||
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/fuse/files/fuse-2.9.9-closefrom-glibc-2-34.patch?id=8a970396fca7aca2d5a761b8e7a8242f1eef14c9";
|
||||
sha256 = "sha256-ELYBW/wxRcSMssv7ejCObrpsJHtOPJcGq33B9yHQII4=";
|
||||
})
|
||||
]);
|
||||
|
||||
nativeBuildInputs = if isFuse3
|
||||
then [ meson ninja pkg-config ]
|
||||
else [ autoreconfHook gettext ];
|
||||
|
||||
outputs = [ "out" ] ++ lib.optional isFuse3 "common";
|
||||
|
||||
mesonFlags = lib.optionals isFuse3 [
|
||||
"-Dudevrulesdir=/udev/rules.d"
|
||||
"-Duseroot=false"
|
||||
];
|
||||
|
||||
preConfigure = ''
|
||||
export MOUNT_FUSE_PATH=$out/sbin
|
||||
export INIT_D_PATH=$TMPDIR/etc/init.d
|
||||
export UDEV_RULES_PATH=$out/etc/udev/rules.d
|
||||
|
||||
# Ensure that FUSE calls the setuid wrapper, not
|
||||
# $out/bin/fusermount. It falls back to calling fusermount in
|
||||
# $PATH, so it should also work on non-NixOS systems.
|
||||
export NIX_CFLAGS_COMPILE="-DFUSERMOUNT_DIR=\"/run/wrappers/bin\""
|
||||
|
||||
substituteInPlace lib/mount_util.c --replace "/bin/" "${util-linux}/bin/"
|
||||
'' + (if isFuse3 then ''
|
||||
# The configure phase will delete these files (temporary workaround for
|
||||
# ./fuse3-install_man.patch)
|
||||
install -D -m444 doc/fusermount3.1 $out/share/man/man1/fusermount3.1
|
||||
install -D -m444 doc/mount.fuse3.8 $out/share/man/man8/mount.fuse3.8
|
||||
'' else ''
|
||||
substituteInPlace util/mount.fuse.c --replace '"su"' '"${shadow.su}/bin/su"'
|
||||
sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh
|
||||
./makeconf.sh
|
||||
'');
|
||||
|
||||
checkInputs = [ which ] ++ (with python3Packages; [ python pytest ]);
|
||||
|
||||
checkPhase = ''
|
||||
python3 -m pytest test/
|
||||
'';
|
||||
|
||||
doCheck = false; # v2: no tests, v3: all tests get skipped in a sandbox
|
||||
|
||||
postFixup = "cd $out\n" + (if isFuse3 then ''
|
||||
install -D -m444 etc/fuse.conf $common/etc/fuse.conf
|
||||
install -D -m444 etc/udev/rules.d/99-fuse3.rules $common/etc/udev/rules.d/99-fuse.rules
|
||||
'' else ''
|
||||
cp ${fusePackages.fuse_3.common}/etc/fuse.conf etc/fuse.conf
|
||||
cp ${fusePackages.fuse_3.common}/etc/udev/rules.d/99-fuse.rules etc/udev/rules.d/99-fuse.rules
|
||||
'');
|
||||
|
||||
meta = with lib; {
|
||||
description = "Library that allows filesystems to be implemented in user space";
|
||||
longDescription = ''
|
||||
FUSE (Filesystem in Userspace) is an interface for userspace programs to
|
||||
export a filesystem to the Linux kernel. The FUSE project consists of two
|
||||
components: The fuse kernel module (maintained in the regular kernel
|
||||
repositories) and the libfuse userspace library (this package). libfuse
|
||||
provides the reference implementation for communicating with the FUSE
|
||||
kernel module.
|
||||
'';
|
||||
homepage = "https://github.com/libfuse/libfuse";
|
||||
changelog = "https://github.com/libfuse/libfuse/releases/tag/fuse-${version}";
|
||||
platforms = platforms.linux;
|
||||
license = with licenses; [ gpl2Only lgpl21Only ];
|
||||
maintainers = [ maintainers.primeos ];
|
||||
};
|
||||
}
|
||||
17
pkgs/os-specific/linux/fuse/default.nix
Normal file
17
pkgs/os-specific/linux/fuse/default.nix
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
{ callPackage, util-linux }:
|
||||
|
||||
let
|
||||
mkFuse = args: callPackage (import ./common.nix args) {
|
||||
inherit util-linux;
|
||||
};
|
||||
in {
|
||||
fuse_2 = mkFuse {
|
||||
version = "2.9.9";
|
||||
sha256Hash = "1yxxvm58c30pc022nl1wlg8fljqpmwnchkywic3r74zirvlcq23n";
|
||||
};
|
||||
|
||||
fuse_3 = mkFuse {
|
||||
version = "3.10.5";
|
||||
sha256Hash = "1yxh85m8fnn3w21f6g6vza7k2giizmyhcbkms4rmkcd2dd2rzk3y";
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
--- a/lib/Makefile.am
|
||||
+++ b/lib/Makefile.am
|
||||
@@ -1,7 +1,7 @@
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
AUTOMAKE_OPTIONS = subdir-objects
|
||||
-AM_CPPFLAGS = -I$(top_srcdir)/include -DFUSERMOUNT_DIR=\"$(bindir)\" \
|
||||
+AM_CPPFLAGS = -I$(top_srcdir)/include \
|
||||
-D_FILE_OFFSET_BITS=64 -D_REENTRANT -DFUSE_USE_VERSION=26
|
||||
|
||||
lib_LTLIBRARIES = libfuse.la libulockmgr.la
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
--- a/lib/meson.build
|
||||
+++ b/lib/meson.build
|
||||
@@ -37,8 +37,7 @@ libfuse = library('fuse3', libfuse_sources, version: meson.project_version(),
|
||||
soversion: '3', include_directories: include_dirs,
|
||||
dependencies: deps, install: true,
|
||||
link_depends: 'fuse_versionscript',
|
||||
- c_args: [ '-DFUSE_USE_VERSION=35',
|
||||
- '-DFUSERMOUNT_DIR="@0@"'.format(fusermount_path) ],
|
||||
+ c_args: [ '-DFUSE_USE_VERSION=35' ],
|
||||
link_args: ['-Wl,--version-script,' + meson.current_source_dir()
|
||||
+ '/fuse_versionscript' ])
|
||||
|
||||
25
pkgs/os-specific/linux/fuse/fuse3-install.patch
Normal file
25
pkgs/os-specific/linux/fuse/fuse3-install.patch
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
--- a/util/install_helper.sh 2019-07-10 12:00:15.984840142 +0200
|
||||
+++ b/util/install_helper.sh 2019-07-10 12:28:56.343011401 +0200
|
||||
@@ -37,10 +37,10 @@
|
||||
fi
|
||||
|
||||
install -D -m 644 "${MESON_SOURCE_ROOT}/util/udev.rules" \
|
||||
- "${DESTDIR}${udevrulesdir}/99-fuse3.rules"
|
||||
+ "${sysconfdir}${udevrulesdir}/99-fuse3.rules"
|
||||
|
||||
install -D -m 755 "${MESON_SOURCE_ROOT}/util/init_script" \
|
||||
- "${DESTDIR}/etc/init.d/fuse3"
|
||||
+ "${sysconfdir}/init.d/fuse3"
|
||||
|
||||
|
||||
if test -x /usr/sbin/update-rc.d && test -z "${DESTDIR}"; then
|
||||
diff --git a/util/meson.build b/util/meson.build
|
||||
index aa0e734..06d4378 100644
|
||||
--- a/util/meson.build
|
||||
+++ b/util/meson.build
|
||||
@@ -1,4 +1,4 @@
|
||||
-fuseconf_path = join_paths(get_option('prefix'), get_option('sysconfdir'), 'fuse.conf')
|
||||
+fuseconf_path = join_paths('/', get_option('sysconfdir'), 'fuse.conf')
|
||||
|
||||
executable('fusermount3', ['fusermount.c', '../lib/mount_util.c'],
|
||||
include_directories: include_dirs,
|
||||
Loading…
Add table
Add a link
Reference in a new issue