gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linuxPackages_hardkernel_latest.usbip: pull upstream fix for -fno-common toolchains

Browse Source 
Without the change builds fails on upstream -gcc-10 as:

    ld: tools/usb/usbip/libsrc/vhci_driver.c:18: multiple definition of
      `udev_context'; tools/usb/usbip/libsrc/usbip_host_common.c:38: first defined here
This commit is contained in:
Sergei Trofimovich
2022-06-04 07:47:40 +01:00
committed by Florian Brandes
parent 251196e603
commit b432be25c7
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
View File

@@ -1,4 +1,4 @@
{ buildPackages, fetchFromGitHub, perl, buildLinux, libelf, util-linux, ... } @ args: { buildPackages, fetchFromGitHub, fetchurl, perl, buildLinux, libelf, util-linux, kernelPatches ? [], ... } @ args:
buildLinux (args // rec { buildLinux (args // rec {
version = "4.14.180-176"; version = "4.14.180-176";
@@ -16,6 +16,14 @@ buildLinux (args // rec {
sha256 = "0n7i7a2bkrm9p1wfr20h54cqm32fbjvwyn703r6zm1f6ivqhk43v"; sha256 = "0n7i7a2bkrm9p1wfr20h54cqm32fbjvwyn703r6zm1f6ivqhk43v";
}; };
kernelPatches = args.kernelPatches ++ [{
name = "usbip-tools-fno-common";
patch = fetchurl {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?id=d5efc2e6b98fe661dbd8dd0d5d5bfb961728e57a";
hash = "sha256-1CXYCV5zMLA4YdbCr8cO2N4CHEDzQChS9qbKYHPm3U4=";
};
}];
defconfig = "odroidxu4_defconfig"; defconfig = "odroidxu4_defconfig";
# This extraConfig is (only) required because the gator module fails to build as-is. # This extraConfig is (only) required because the gator module fails to build as-is.

4
pkgs/os-specific/linux/usbip/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, stdenv, kernel, udev, autoconf, automake, libtool, hwdata, kernelOlder }: { lib, stdenv, fetchpatch, kernel, udev, autoconf, automake, libtool, hwdata, kernelOlder }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "usbip-${kernel.name}"; name = "usbip-${kernel.name}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
./fix-snprintf-truncation.patch ./fix-snprintf-truncation.patch
# fixes build with gcc9 # fixes build with gcc9
./fix-strncpy-truncation.patch ./fix-strncpy-truncation.patch
]; ] ++ kernel.patches;
nativeBuildInputs = [ autoconf automake libtool ]; nativeBuildInputs = [ autoconf automake libtool ];
buildInputs = [ udev ]; buildInputs = [ udev ];