Skip to contentSkip to conversation

trinity: bump version to fix a build failure using Linux 3.19 headers

PATCH New Fabio Porcedda 2 participants 3 messages Feb 22, 2015 – Feb 24, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 trinity: bump version to fix a build failure using Linux 3.19 headers

bump to the following trinity repository commit:

kvm: Add ifdef around IA64 ioctls.
Fix build error.

CC ioctls/kvm.o
In file included from ioctls/kvm.c:8:0:
ioctls/kvm.c:115:8: error: ?KVM_IA64_VCPU_GET_STACK? undeclared here (not in a function)
IOCTL(KVM_IA64_VCPU_GET_STACK),

        ^
include/ioctls.h:53:15: note: in definition of macro ?IOCTL?
  { .request = _request, .name = #_request, }
               ^
ioctls/kvm.c:116:8: error: ?KVM_IA64_VCPU_SET_STACK? undeclared here (not in a function)
  IOCTL(KVM_IA64_VCPU_SET_STACK),
        ^

include/ioctls.h:53:15: note: in definition of macro ?IOCTL?
{ .request = _request, .name = #_request, }

IA64 ioctls were removed in Linux 3.19.

---
 package/trinity/trinity.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/trinity/trinity.mk +1 -1
index 52805e0..5f8a707 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TRINITY_VERSION = 5d2dfe9727eb9c8dc44c31e95968e8d85284ffcc
+TRINITY_VERSION = c8c41f99500b5854c2061a08962b8908c872d852
 TRINITY_SITE = $(call github,kernelslacker,trinity,$(TRINITY_VERSION))
 TRINITY_LICENSE = GPLv2
 TRINITY_LICENSE_FILES = COPYING
Signature · 1 line
2.3.0
#1 lore raw

PATCH 1/1 trinity: bump version to fix a build failure using Linux 3.19 headers

Dear Fabio Porcedda,

Quoted 16 lines · Fabio Porcedda

bump to the following trinity repository commit:

kvm: Add ifdef around IA64 ioctls.
Fix build error.

CC ioctls/kvm.o
In file included from ioctls/kvm.c:8:0:
ioctls/kvm.c:115:8: error: ?KVM_IA64_VCPU_GET_STACK? undeclared here (not in a function)
IOCTL(KVM_IA64_VCPU_GET_STACK),

        ^
include/ioctls.h:53:15: note: in definition of macro ?IOCTL?
  { .request = _request, .name = #_request, }
               ^
ioctls/kvm.c:116:8: error: ?KVM_IA64_VCPU_SET_STACK? undeclared here (not in a function)
  IOCTL(KVM_IA64_VCPU_SET_STACK),
        ^
Quoted 6 lines

include/ioctls.h:53:15: note: in definition of macro ?IOCTL?
{ .request = _request, .name = #_request, }

IA64 ioctls were removed in Linux 3.19.

Applied to next, thanks.

I initially wondered if we shouldn't apply this to master, but since it happens only with 3.19 kernel headers, and such option has only been added in next, I indeed decided to apply this patch only to the next branch.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 trinity: bump version to fix a build failure using Linux 3.19 headers

Quoted 24 lines · Thomas Petazzoni

Dear Fabio Porcedda,

Quoted 21 lines · Fabio Porcedda

bump to the following trinity repository commit:

kvm: Add ifdef around IA64 ioctls.
Fix build error.

CC ioctls/kvm.o
In file included from ioctls/kvm.c:8:0:
ioctls/kvm.c:115:8: error: ?KVM_IA64_VCPU_GET_STACK? undeclared here (not in a function)
IOCTL(KVM_IA64_VCPU_GET_STACK),

        ^
include/ioctls.h:53:15: note: in definition of macro ?IOCTL?
  { .request = _request, .name = #_request, }
               ^
ioctls/kvm.c:116:8: error: ?KVM_IA64_VCPU_SET_STACK? undeclared here (not in a function)
  IOCTL(KVM_IA64_VCPU_SET_STACK),
        ^

include/ioctls.h:53:15: note: in definition of macro ?IOCTL?
{ .request = _request, .name = #_request, }

IA64 ioctls were removed in Linux 3.19.

Quoted 8 lines
Quoted 1 line

Applied to next, thanks.

I initially wondered if we shouldn't apply this to master, but since it happens only with 3.19 kernel headers, and such option has only been added in next, I indeed decided to apply this patch only to the next branch.

I've submitted the patch to next for the same reason.

Thanks

Signature · 1 line
Fabio Porcedda