From 8510ac11520d2a5c5d73e2851f2ef07bc32c1da3 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Mon, 20 Jun 2016 16:44:41 +0200 Subject: e2fsprogs: update to 1.42.13 Update e2fsprogs to v1.42.13 from 1.42.12 Signed-off-by: Kevin Darbyshire-Bryant --- package/utils/e2fsprogs/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/utils') diff --git a/package/utils/e2fsprogs/Makefile b/package/utils/e2fsprogs/Makefile index bc1e5ed5ca..e90a752080 100644 --- a/package/utils/e2fsprogs/Makefile +++ b/package/utils/e2fsprogs/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=e2fsprogs -PKG_VERSION:=1.42.12 -PKG_MD5SUM:=68255f51be017a93f2f6402fab06c2bf +PKG_VERSION:=1.42.13 +PKG_MD5SUM:=bc759fc62666786f5436e2075beb3265 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -- cgit v1.2.3 From 557ecbebe7216ba4f898bbc3fb45bdae818c06d5 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 21 Jun 2016 15:57:10 +0200 Subject: package: mark nvram and otrx nonshared as they're target specific Signed-off-by: Jo-Philipp Wich --- package/utils/nvram/Makefile | 1 + package/utils/otrx/Makefile | 1 + 2 files changed, 2 insertions(+) (limited to 'package/utils') diff --git a/package/utils/nvram/Makefile b/package/utils/nvram/Makefile index 992f3366ba..040d953582 100644 --- a/package/utils/nvram/Makefile +++ b/package/utils/nvram/Makefile @@ -11,6 +11,7 @@ PKG_NAME:=nvram PKG_RELEASE:=9 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) +PKG_FLAGS:=nonshared include $(INCLUDE_DIR)/package.mk diff --git a/package/utils/otrx/Makefile b/package/utils/otrx/Makefile index 360fb1790d..ba981fcc84 100644 --- a/package/utils/otrx/Makefile +++ b/package/utils/otrx/Makefile @@ -9,6 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=otrx PKG_RELEASE:=1 +PKG_FLAGS:=nonshared include $(INCLUDE_DIR)/package.mk -- cgit v1.2.3 From e5cbcbe736186d67b11ada76e0057259ca35e662 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 21 Jun 2016 16:00:32 +0200 Subject: package: flag further target specific packages as nonshared Add nonshared flag to package depending on specific targets or subtargets as there's no guarantee otherwise that they'll be available in the shared repo. [Edit: files modified in previous commit were removed from the list.] Signed-off-by: Jo-Philipp Wich Signed-off-by: Zoltan HERPAI --- package/utils/admswconfig/Makefile | 2 ++ package/utils/oseama/Makefile | 2 ++ 2 files changed, 4 insertions(+) (limited to 'package/utils') diff --git a/package/utils/admswconfig/Makefile b/package/utils/admswconfig/Makefile index 820f854ff8..6f4b6049e2 100644 --- a/package/utils/admswconfig/Makefile +++ b/package/utils/admswconfig/Makefile @@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.openwrt.org/sources PKG_MD5SUM:=faafd4618f970119a665b11b21ac6a26 +PKG_FLAGS:=nonshared + include $(INCLUDE_DIR)/package.mk define Package/admswconfig diff --git a/package/utils/oseama/Makefile b/package/utils/oseama/Makefile index ad1395c7be..8957a69967 100644 --- a/package/utils/oseama/Makefile +++ b/package/utils/oseama/Makefile @@ -10,6 +10,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=oseama PKG_RELEASE:=1 +PKG_FLAGS:=nonshared + include $(INCLUDE_DIR)/package.mk define Package/oseama -- cgit v1.2.3 From e95f2e2f7217340cff5f8cc37fbd69ffba367c80 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 21 Jun 2016 16:11:36 +0200 Subject: busybox: fix issues with the ip command on mips64 Signed-off-by: Felix Fietkau --- ...lem-on-mips64-n64-big-endian-musl-systems.patch | 75 ++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 package/utils/busybox/patches/030-ip-fix-problem-on-mips64-n64-big-endian-musl-systems.patch (limited to 'package/utils') diff --git a/package/utils/busybox/patches/030-ip-fix-problem-on-mips64-n64-big-endian-musl-systems.patch b/package/utils/busybox/patches/030-ip-fix-problem-on-mips64-n64-big-endian-musl-systems.patch new file mode 100644 index 0000000000..6e25f55881 --- /dev/null +++ b/package/utils/busybox/patches/030-ip-fix-problem-on-mips64-n64-big-endian-musl-systems.patch @@ -0,0 +1,75 @@ +From: Szabolcs Nagy +Date: Sun, 24 Apr 2016 17:39:02 +0200 +Subject: [PATCH] ip: fix problem on mips64 n64 big endian musl systems + +Use designated initializers for struct msghdr. +The struct layout is non-portable and musl libc does not match what busybox expects. + +Signed-off-by: Szabolcs Nagy +Tested-by: Waldemar Brodkorb +Signed-off-by: Denys Vlasenko +--- + +--- a/networking/libiproute/libnetlink.c ++++ b/networking/libiproute/libnetlink.c +@@ -71,11 +71,15 @@ int FAST_FUNC rtnl_dump_request(struct r + struct nlmsghdr nlh; + struct sockaddr_nl nladdr; + struct iovec iov[2] = { { &nlh, sizeof(nlh) }, { req, len } }; ++ /* Use designated initializers, struct layout is non-portable */ + struct msghdr msg = { +- (void*)&nladdr, sizeof(nladdr), +- iov, 2, +- NULL, 0, +- 0 ++ .msg_name = (void*)&nladdr, ++ .msg_namelen = sizeof(nladdr), ++ .msg_iov = iov, ++ .msg_iovlen = 2, ++ .msg_control = NULL, ++ .msg_controllen = 0, ++ .msg_flags = 0 + }; + + memset(&nladdr, 0, sizeof(nladdr)); +@@ -104,12 +108,15 @@ static int rtnl_dump_filter(struct rtnl_ + while (1) { + int status; + struct nlmsghdr *h; +- ++ /* Use designated initializers, struct layout is non-portable */ + struct msghdr msg = { +- (void*)&nladdr, sizeof(nladdr), +- &iov, 1, +- NULL, 0, +- 0 ++ .msg_name = (void*)&nladdr, ++ .msg_namelen = sizeof(nladdr), ++ .msg_iov = &iov, ++ .msg_iovlen = 1, ++ .msg_control = NULL, ++ .msg_controllen = 0, ++ .msg_flags = 0 + }; + + status = recvmsg(rth->fd, &msg, 0); +@@ -211,11 +218,15 @@ int FAST_FUNC rtnl_talk(struct rtnl_hand + struct sockaddr_nl nladdr; + struct iovec iov = { (void*)n, n->nlmsg_len }; + char *buf = xmalloc(8*1024); /* avoid big stack buffer */ ++ /* Use designated initializers, struct layout is non-portable */ + struct msghdr msg = { +- (void*)&nladdr, sizeof(nladdr), +- &iov, 1, +- NULL, 0, +- 0 ++ .msg_name = (void*)&nladdr, ++ .msg_namelen = sizeof(nladdr), ++ .msg_iov = &iov, ++ .msg_iovlen = 1, ++ .msg_control = NULL, ++ .msg_controllen = 0, ++ .msg_flags = 0 + }; + + memset(&nladdr, 0, sizeof(nladdr)); -- cgit v1.2.3 From 59619ccbd3f233b774a6ac1c74394a2327813de5 Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Tue, 21 Jun 2016 16:26:13 +0200 Subject: usbutils: Use github alias Instead of hardcoding URL to Github use alias. Signed-off-by: Daniel Engberg --- package/utils/usbutils/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/utils') diff --git a/package/utils/usbutils/Makefile b/package/utils/usbutils/Makefile index ff737847d1..2b44df9e90 100644 --- a/package/utils/usbutils/Makefile +++ b/package/utils/usbutils/Makefile @@ -36,7 +36,7 @@ endef define Download/usb_ids FILE:=$(USB_IDS_FILE) - URL:=https://raw.githubusercontent.com/gentoo/hwids/d9e840aa3d5cedf5637d59ef0dc555c380a0e822 + URL:=@GITHUB/gentoo/hwids/d9e840aa3d5cedf5637d59ef0dc555c380a0e822 MD5SUM:=$(USB_IDS_MD5SUM) endef $(eval $(call Download,usb_ids)) -- cgit v1.2.3