Skip to content

Commit 5b9da0f

Browse files
committed
Merge branch 'dev-extra'
2 parents 7df617d + 5938dcb commit 5b9da0f

File tree

5 files changed

+32
-30
lines changed

5 files changed

+32
-30
lines changed

extra/package/bindfs/bindfs.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
BINDFS_VERSION = 1.14.1
7+
BINDFS_VERSION = 1.15.1
88
BINDFS_SOURCE = bindfs-$(BINDFS_VERSION).tar.gz
99
BINDFS_SITE = https://bindfs.org/downloads
1010
BINDFS_DEPENDENCIES = host-pkgconf libfuse

extra/package/criu/criu.mk

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
#
55
################################################################################
66

7-
CRIU_VERSION = v3.13
7+
CRIU_VERSION = v3.17
88
CRIU_SITE = $(call github,checkpoint-restore,criu,$(CRIU_VERSION))
99
CRIU_DEPENDENCIES = libcap protobuf-c libnl libnet iproute2 tar libbsd
1010
CRIU_LICENSE = GPLv2 (programs), LGPLv2.1 (libraries)
1111
CRIU_LICENSE_FILES = COPYING
1212

1313
CRIU_MAKE_ENV = $(TARGET_MAKE_ENV)
14-
CRIU_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/libnl3
14+
CRIU_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/libnl3 \
15+
-D_SYS_RSEQ_H
1516

1617
ifeq ($(BR2_x86_64),y)
1718
CRIU_HOSTCFLAGS = -DCONFIG_X86_64
@@ -29,7 +30,7 @@ endif
2930
endif
3031

3132
CRIU_MAKE_OPTS = PREFIX=/usr CC="$(TARGET_CC) $(CRIU_CFLAGS) $(TARGET_LDFLAGS)" \
32-
HOSTCFLAGS="$(CRIU_HOSTCFLAGS)"
33+
HOSTCFLAGS="$(CRIU_HOSTCFLAGS)" LD="$(TARGET_LD)"
3334

3435
define CRIU_BUILD_CMDS
3536
$(RM) $(@D)/images/google/protobuf/descriptor.proto

extra/package/ipvsadm/ipvsadm.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
IPVSADM_VERSION = 1.29
7+
IPVSADM_VERSION = 1.31
88
IPVSADM_SOURCE = ipvsadm-$(IPVSADM_VERSION).tar.gz
99
IPVSADM_SITE = https://kernel.org/pub/linux/utils/kernel/ipvsadm
1010
IPVSADM_DEPENDENCIES = host-pkgconf host-popt popt

extra/package/qemu-ga/qemu-ga.mk

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
################################################################################
66

7-
QEMU_GA_VERSION = 3.1.0
7+
QEMU_GA_VERSION = 7.0.0
88
QEMU_GA_SOURCE = qemu-$(QEMU_GA_VERSION).tar.xz
99
QEMU_GA_SITE = https://download.qemu.org
1010
QEMU_GA_LICENSE = GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c
@@ -36,39 +36,40 @@ define QEMU_GA_CONFIGURE_CMDS
3636
./configure \
3737
--prefix=/usr \
3838
--cross-prefix=$(TARGET_CROSS) \
39+
--disable-sanitizers \
3940
--audio-drv-list= \
41+
\
4042
--enable-kvm \
4143
--enable-attr \
4244
--enable-vhost-net \
43-
--disable-bsd-user \
44-
--disable-xen \
45+
\
46+
--disable-capstone \
4547
--disable-slirp \
46-
--disable-vnc \
47-
--disable-virtfs \
48+
--disable-strip \
49+
\
4850
--disable-brlapi \
49-
--disable-curses \
50-
--disable-curl \
51-
--disable-bluez \
52-
--disable-vde \
53-
--disable-linux-aio \
5451
--disable-cap-ng \
52+
--disable-curl \
53+
--disable-curses \
5554
--disable-docs \
56-
--disable-spice \
57-
--disable-rbd \
58-
--disable-libiscsi \
59-
--disable-usb-redir \
60-
--disable-strip \
61-
--disable-sparse \
62-
--disable-mpath \
63-
--disable-sanitizers \
6455
--disable-hvf \
65-
--disable-whpx \
56+
--disable-libiscsi \
57+
--disable-linux-aio \
6658
--disable-malloc-trim \
6759
--disable-membarrier \
60+
--disable-mpath \
61+
--disable-rbd \
62+
--disable-sparse \
63+
--disable-spice \
64+
--disable-usb-redir \
65+
--disable-vde \
66+
--disable-virtfs \
67+
--disable-vnc \
68+
--disable-whpx \
69+
--disable-xen \
70+
\
71+
--disable-bsd-user \
6872
--disable-vhost-crypto \
69-
--disable-libxml2 \
70-
--disable-capstone \
71-
--disable-git-update \
7273
--disable-opengl \
7374
$(QEMU_GA_OPTS) \
7475
)
@@ -79,7 +80,7 @@ define QEMU_GA_BUILD_CMDS
7980
endef
8081

8182
define QEMU_GA_INSTALL_TARGET_CMDS
82-
$(INSTALL) -D -m 0755 $(@D)/qemu-ga $(TARGET_DIR)/usr/bin/qemu-ga
83+
$(INSTALL) -D -m 0755 $(@D)/build/qga/qemu-ga $(TARGET_DIR)/usr/bin/qemu-ga
8384
$(INSTALL) -D -m 0755 $(QEMU_GA_PKGDIR)/qemu-ga $(TARGET_DIR)/etc/init.d/qemu-ga
8485
endef
8586

extra/package/shadow/shadow.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
#
55
################################################################################
66

7-
SHADOW_VERSION = 4.6
7+
SHADOW_VERSION = 4.11.1
88
SHADOW_SOURCE = shadow-$(SHADOW_VERSION).tar.xz
9-
SHADOW_SITE = https://github.com/shadow-maint/shadow/releases/download/$(SHADOW_VERSION)
9+
SHADOW_SITE = https://github.com/shadow-maint/shadow/releases/download/v$(SHADOW_VERSION)
1010
SHADOW_LICENSE = BSD-3c
1111
SHADOW_LICENSE_FILES = COPYING
1212
SHADOW_DEPENDENCIES = acl attr

0 commit comments

Comments
 (0)