summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/vars.mk2
-rw-r--r--package/hdparm/patches/patch-Makefile15
-rw-r--r--package/iproute2/patches/patch-netem_normal_c13
-rw-r--r--package/iproute2/patches/patch-netem_pareto_c14
-rw-r--r--package/iproute2/patches/patch-netem_paretonormal_c15
-rw-r--r--package/iproute2/patches/patch-tc_tc_core_h11
-rw-r--r--package/kexec-tools/Makefile6
-rw-r--r--target/packages/pkg-available/development1
8 files changed, 63 insertions, 14 deletions
diff --git a/mk/vars.mk b/mk/vars.mk
index 349c1ebb6..ffd729ff4 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -218,7 +218,7 @@ QUIET:=
else
QUIET:= --quiet
endif
-FETCH_CMD?= wget --timeout=$(ADK_WGET_TIMEOUT) -t 3 $(QUIET)
+FETCH_CMD?= wget --timeout=$(ADK_WGET_TIMEOUT) -t 3 --no-check-certificate $(QUIET)
ifeq ($(ADK_HOST_CYGWIN),y)
EXEEXT:= .exe
diff --git a/package/hdparm/patches/patch-Makefile b/package/hdparm/patches/patch-Makefile
new file mode 100644
index 000000000..a354cfaa5
--- /dev/null
+++ b/package/hdparm/patches/patch-Makefile
@@ -0,0 +1,15 @@
+--- hdparm-9.43.orig/Makefile 2012-03-08 21:14:40.000000000 +0100
++++ hdparm-9.43/Makefile 2014-02-07 20:38:09.000000000 +0100
+@@ -48,9 +48,9 @@ install: all hdparm.8
+ if [ -f $(DESTDIR)$(sbindir)/hdparm ]; then rm -f $(DESTDIR)$(sbindir)/hdparm ; fi
+ if [ -f $(DESTDIR)$(mandir)/man8/hdparm.8 ]; then rm -f $(DESTDIR)$(mandir)/man8/hdparm.8 ;\
+ elif [ -f $(DESTDIR)$(oldmandir)/man8/hdparm.8 ]; then rm -f $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi
+- $(INSTALL_PROGRAM) -D hdparm $(DESTDIR)$(sbindir)/hdparm
+- if [ -d $(DESTDIR)$(mandir) ]; then $(INSTALL_DATA) -D hdparm.8 $(DESTDIR)$(mandir)/man8/hdparm.8 ;\
+- elif [ -d $(DESTDIR)$(oldmandir) ]; then $(INSTALL_DATA) -D hdparm.8 $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi
++ $(INSTALL_PROGRAM) hdparm $(DESTDIR)$(sbindir)/hdparm
++ if [ -d $(DESTDIR)$(mandir) ]; then $(INSTALL_DATA) hdparm.8 $(DESTDIR)$(mandir)/man8/hdparm.8 ;\
++ elif [ -d $(DESTDIR)$(oldmandir) ]; then $(INSTALL_DATA) hdparm.8 $(DESTDIR)$(oldmandir)/man8/hdparm.8 ; fi
+
+ clean:
+ -rm -f hdparm $(OBJS) core 2>/dev/null
diff --git a/package/iproute2/patches/patch-netem_normal_c b/package/iproute2/patches/patch-netem_normal_c
index 719899301..3eada6d03 100644
--- a/package/iproute2/patches/patch-netem_normal_c
+++ b/package/iproute2/patches/patch-netem_normal_c
@@ -1,10 +1,13 @@
---- iproute2-2.6.29-1.orig/netem/normal.c 2009-03-24 23:40:54.000000000 +0100
-+++ iproute2-2.6.29-1/netem/normal.c 2009-12-11 16:35:38.000000000 +0100
-@@ -8,7 +8,6 @@
+--- iproute2-3.12.0.orig/netem/normal.c 2013-11-23 02:10:33.000000000 +0100
++++ iproute2-3.12.0/netem/normal.c 2014-02-09 11:40:30.000000000 +0100
+@@ -8,9 +8,7 @@
#include <string.h>
#include <limits.h>
-#include <linux/types.h>
- #include <linux/pkt_sched.h>
-
+-#include <linux/pkt_sched.h>
+-
++#define NETEM_DIST_SCALE 8192
#define TABLESIZE 16384
+ #define TABLEFACTOR NETEM_DIST_SCALE
+
diff --git a/package/iproute2/patches/patch-netem_pareto_c b/package/iproute2/patches/patch-netem_pareto_c
new file mode 100644
index 000000000..b422a56a0
--- /dev/null
+++ b/package/iproute2/patches/patch-netem_pareto_c
@@ -0,0 +1,14 @@
+--- iproute2-3.12.0.orig/netem/pareto.c 2013-11-23 02:10:33.000000000 +0100
++++ iproute2-3.12.0/netem/pareto.c 2014-02-09 11:46:07.000000000 +0100
+@@ -7,10 +7,8 @@
+ #include <math.h>
+ #include <limits.h>
+
+-#include <linux/types.h>
+-#include <linux/pkt_sched.h>
+-
+ static const double a=3.0;
++#define NETEM_DIST_SCALE 8192
+ #define TABLESIZE 16384
+ #define TABLEFACTOR NETEM_DIST_SCALE
+
diff --git a/package/iproute2/patches/patch-netem_paretonormal_c b/package/iproute2/patches/patch-netem_paretonormal_c
index d2c2ac4b6..5ff674e5a 100644
--- a/package/iproute2/patches/patch-netem_paretonormal_c
+++ b/package/iproute2/patches/patch-netem_paretonormal_c
@@ -1,6 +1,6 @@
---- iproute2-2.6.29-1.orig/netem/paretonormal.c 2009-03-24 23:40:54.000000000 +0100
-+++ iproute2-2.6.29-1/netem/paretonormal.c 2009-12-11 16:59:02.000000000 +0100
-@@ -11,11 +11,9 @@
+--- iproute2-3.12.0.orig/netem/paretonormal.c 2013-11-23 02:10:33.000000000 +0100
++++ iproute2-3.12.0/netem/paretonormal.c 2014-02-09 12:22:09.000000000 +0100
+@@ -11,15 +11,11 @@
*/
#include <stdio.h>
#include <stdlib.h>
@@ -9,6 +9,11 @@
#include <math.h>
#include <limits.h>
-#include <malloc.h>
+-
+-#include <linux/types.h>
+-#include <linux/pkt_sched.h>
+
++#define NETEM_DIST_SCALE 8192
+ #define TABLESIZE 16384
+ #define TABLEFACTOR NETEM_DIST_SCALE
- #include <linux/types.h>
- #include <linux/pkt_sched.h>
diff --git a/package/iproute2/patches/patch-tc_tc_core_h b/package/iproute2/patches/patch-tc_tc_core_h
new file mode 100644
index 000000000..2716b71c8
--- /dev/null
+++ b/package/iproute2/patches/patch-tc_tc_core_h
@@ -0,0 +1,11 @@
+--- iproute2-3.12.0.orig/tc/tc_core.h 2013-11-23 02:10:33.000000000 +0100
++++ iproute2-3.12.0/tc/tc_core.h 2014-02-08 20:19:59.000000000 +0100
+@@ -1,7 +1,7 @@
+ #ifndef _TC_CORE_H_
+ #define _TC_CORE_H_ 1
+
+-#include <asm/types.h>
++#include <sys/types.h>
+ #include <linux/pkt_sched.h>
+
+ #define TIME_UNITS_PER_SEC 1000000
diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile
index 3ea6904d2..157d9db03 100644
--- a/package/kexec-tools/Makefile
+++ b/package/kexec-tools/Makefile
@@ -4,15 +4,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= kexec-tools
-PKG_VERSION:= 2.0.3
+PKG_VERSION:= 2.0.5
PKG_RELEASE:= 1
-PKG_MD5SUM:= 1b362abd2e8669171a5ba50a9cc26183
+PKG_MD5SUM:= da5887e30eec16895e9d98ef072dc257
PKG_DESCR:= kexec tools
PKG_SECTION:= misc
PKG_DEPENDS:= zlib
PKG_BUILDEP:= zlib
PKG_URL:= http://kernel.org/pub/linux/utils/kernel/kexec/
-PKG_SITES:= http://kernel.org/pub/linux/utils/kernel/kexec/
+PKG_SITES:= http://openadk.org/distfiles/
PKG_ARCH_DEPENDS:= !mips !m68k
PKG_CFLINE_KEXEC_TOOLS:= select ADK_KERNEL_KEXEC
diff --git a/target/packages/pkg-available/development b/target/packages/pkg-available/development
index bf2824564..7a6d5e14c 100644
--- a/target/packages/pkg-available/development
+++ b/target/packages/pkg-available/development
@@ -33,6 +33,7 @@ config ADK_PKG_DEVELOPMENT
select ADK_PACKAGE_ZLIB
select ADK_PACKAGE_ZLIB_DEV
select ADK_PACKAGE_XZ
+ select ADK_PACKAGE_WGET
# optional
select ADK_PACKAGE_STRACE
select ADK_PACKAGE_GDB
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 19:46:07 +0000