This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

sync with LEDE 09.2017

  • Loading branch information...
zyxmon committed Sep 21, 2017
1 parent fd7843d commit ee8875da07180b686b3539ba0dd06cad1fbdb9d9
Showing with 6,804 additions and 5,656 deletions.
  1. +4 −5 LastSync.txt
  2. +4 −3 config/Config-build.in
  3. +1 −1 config/Config-images.in
  4. +11 −5 config/Config-kernel.in
  5. +39 −1 include/image-commands.mk
  6. +1 −0 include/image-legacy.mk
  7. +2 −0 include/netfilter.mk
  8. +13 −5 include/quilt.mk
  9. +0 −22 include/shell.sh
  10. +3 −1 include/target.mk
  11. +2 −1 include/toplevel.mk
  12. +1 −8 package/boot/kexec-tools/Config.in
  13. +50 −16 package/boot/kexec-tools/Makefile
  14. +7 −0 package/boot/kexec-tools/files/kdump.config
  15. +11 −0 package/boot/kexec-tools/files/kdump.defaults
  16. +182 −0 package/boot/kexec-tools/files/kdump.init
  17. +3 −3 package/devel/gdb-arc/Makefile
  18. +2 −1 package/devel/gdb/Makefile
  19. +1 −1 package/devel/perf/Makefile
  20. +2 −2 package/devel/strace/Makefile
  21. +3 −3 package/devel/valgrind/Makefile
  22. +1 −1 package/devel/valgrind/patches/100-fix_configure_check.patch
  23. +3 −3 package/libs/libnftnl/Makefile
  24. +3 −3 package/libs/libubox/Makefile
  25. +2 −2 package/libs/libunwind/Makefile
  26. +0 −46 package/libs/libunwind/patches/004-add-missing-unwind_i.h.patch
  27. +2 −2 package/libs/mbedtls/Makefile
  28. +26 −26 package/libs/mbedtls/patches/200-config.patch
  29. +2 −2 package/libs/openssl/Makefile
  30. +1 −1 package/libs/openssl/patches/150-no_engines.patch
  31. +2 −2 package/libs/openssl/patches/160-disable_doc_tests.patch
  32. +5 −5 package/libs/openssl/patches/200-parallel_build.patch
  33. +2 −0 package/libs/{libreadline → readline}/Makefile
  34. 0 package/libs/{libreadline → readline}/patches/001-install_perm.patch
  35. +3 −3 package/libs/uclient/Makefile
  36. +4 −4 package/network/config/firewall/Makefile
  37. +1 −1 package/network/config/gre/Makefile
  38. +1 −1 package/network/config/gre/files/gre.sh
  39. +0 −2 package/network/config/ltq-adsl-app/files/dsl_control
  40. +4 −3 package/network/config/ltq-vdsl-app/Makefile
  41. +16 −0 package/network/config/ltq-vdsl-app/files/10_atm.sh
  42. +14 −0 package/network/config/ltq-vdsl-app/files/10_ptm.sh
  43. +53 −20 package/network/config/ltq-vdsl-app/files/dsl_control
  44. +0 −11 package/network/config/ltq-vdsl-app/files/vdsl_cpe_control_wrapper
  45. +3 −3 package/network/config/netifd/Makefile
  46. +1 −0 package/network/config/qos-scripts/Makefile
  47. +1 −1 package/network/ipv6/map/Makefile
  48. +11 −6 package/network/ipv6/map/files/map.sh
  49. +1 −1 package/network/ipv6/map/src/mapcalc.c
  50. +4 −4 package/network/ipv6/odhcp6c/Makefile
  51. +18 −1 package/network/ipv6/odhcp6c/files/dhcpv6.script
  52. +5 −2 package/network/ipv6/odhcp6c/files/dhcpv6.sh
  53. +6 −6 package/network/services/dnsmasq/Makefile
  54. +1 −1 package/network/services/dnsmasq/files/dhcp.conf
  55. +50 −15 package/network/services/dnsmasq/files/dnsmasq.init
  56. +4 −0 package/network/services/dnsmasq/files/dnsmasq_acl.json
  57. +25 −0 package/network/services/dnsmasq/patches/010-Tweak-ICMP-ping-check-logic-for-DHCPv4.patch
  58. +28 −0 package/network/services/dnsmasq/patches/011-Remove-ping-check-of-configured-DHCP-address.patch
  59. +31 −0 ...e/network/services/dnsmasq/patches/020-Try-other-servers-if-first-returns-REFUSED-when-stri.patch
  60. +94 −0 package/network/services/dnsmasq/patches/025-backport-fix-CVE-2017-13704.patch
  61. +44 −0 package/network/services/dnsmasq/patches/030-fix-arcount-edns0-behaviour.patch
  62. +1 −1 package/network/services/dropbear/Makefile
  63. +4 −2 package/network/services/dropbear/files/dropbear.init
  64. +130 −0 package/network/services/dropbear/patches/010-runtime-maxauthtries.patch
  65. +2 −2 package/network/services/dropbear/patches/610-skip-default-keys-in-custom-runs.patch
  66. +1 −1 package/network/services/hostapd/Makefile
  67. +15 −8 package/network/services/hostapd/files/hostapd.sh
  68. +47 −2 package/network/services/hostapd/patches/600-ubus_support.patch
  69. +55 −0 package/network/services/hostapd/src/src/ap/ubus.c
  70. +5 −0 package/network/services/hostapd/src/src/ap/ubus.h
  71. +3 −3 package/network/services/lldpd/Makefile
  72. +3 −3 package/network/services/odhcpd/Makefile
  73. +25 −16 package/network/services/openvpn-easy-rsa/Makefile
  74. 0 package/network/services/openvpn-easy-rsa/files/easy-rsa.index
  75. +0 −1 package/network/services/openvpn-easy-rsa/files/easy-rsa.serial
  76. +1 −0 package/network/services/openvpn-easy-rsa/files/openvpn-easy-rsa.upgrade
  77. +0 −152 package/network/services/openvpn-easy-rsa/patches/100-run-ootb.patch
  78. +4 −3 package/network/services/openvpn/Makefile
  79. +1 −1 package/network/services/openvpn/patches/001-reproducible-remove_DATE.patch
  80. +1 −1 package/network/services/openvpn/patches/100-mbedtls-disable-runtime-version-check.patch
  81. +1 −1 package/network/services/openvpn/patches/210-build_always_use_internal_lz4.patch
  82. +7 −7 package/network/services/openvpn/patches/220-disable_des.patch
  83. +1 −1 package/network/services/ppp/Makefile
  84. +3 −0 package/network/services/ppp/files/lib/netifd/ppp6-up
  85. +15 −2 package/network/services/samba36/Makefile
  86. +1 −6 package/network/services/samba36/files/samba.init
  87. +0 −2 package/network/services/umdns/files/umdns.init
  88. +1 −1 package/network/utils/comgt/Makefile
  89. +1 −1 package/network/utils/comgt/files/3g.sh
  90. +1 −2 package/network/utils/comgt/files/directip.sh
  91. +2 −2 package/network/utils/curl/Makefile
  92. +2 −2 package/network/utils/curl/patches/200-no_docs_tests.patch
  93. +1 −1 package/network/utils/curl/patches/310-mbedtls-disable-runtime-version-check.patch
  94. +37 −3 package/network/utils/iperf3/Makefile
  95. +41 −0 package/network/utils/iperf3/patches/010-fix-openssl-ac-macro.patch
  96. +17 −0 package/network/utils/iperf3/patches/100-iperf_auth-rsa-header.patch
  97. +4 −0 package/network/utils/iproute2/Makefile
  98. +15 −6 package/network/utils/ipset/Makefile
  99. +1 −0 package/network/utils/iptables/Makefile
  100. +2 −3 package/network/utils/iwinfo/Makefile
  101. +3 −3 package/network/utils/nftables/Makefile
  102. +76 −0 package/network/utils/nftables/patches/101-nftables-statement-fix-print-of-ip-dnat-address.patch
  103. +2 −2 package/network/utils/tcpdump/Makefile
  104. +39 −35 package/network/utils/tcpdump/patches/100-tcpdump_mini.patch
  105. +2 −2 package/network/utils/xtables-addons/Makefile
  106. +3 −3 package/system/ca-certificates/Makefile
  107. +3 −3 package/system/fstools/Makefile
  108. +9 −7 package/system/fstools/files/snapshot
  109. +6 −41 package/system/procd/Makefile
  110. +4 −4 package/system/procd/files/hotplug-preinit.json
  111. +11 −11 package/system/procd/files/hotplug.json
  112. +0 −21 package/system/procd/files/nand-preinit.sh
  113. +0 −375 package/system/procd/files/nand.sh
  114. +3 −3 package/system/procd/files/procd.sh
  115. +3 −3 package/system/ubox/Makefile
  116. +3 −3 package/system/uci/Makefile
  117. +2 −2 package/utils/bsdiff/Makefile
  118. +768 −591 package/utils/busybox/Config-defaults.in
  119. +13 −7 package/utils/busybox/Makefile
  120. +103 −255 package/utils/busybox/config/Config.in
  121. +118 −67 package/utils/busybox/config/archival/Config.in
  122. +40 −61 package/utils/busybox/config/console-tools/Config.in
  123. +330 −375 package/utils/busybox/config/coreutils/Config.in
  124. +5 −15 package/utils/busybox/config/debianutils/Config.in
  125. +16 −21 package/utils/busybox/config/editors/Config.in
  126. +11 −31 package/utils/busybox/config/findutils/Config.in
  127. +26 −30 package/utils/busybox/config/init/Config.in
  128. +163 −16 package/utils/busybox/config/libbb/Config.in
  129. +18 −18 package/utils/busybox/config/loginutils/Config.in
  130. +7 −11 package/utils/busybox/config/mailutils/Config.in
  131. +259 −360 package/utils/busybox/config/miscutils/Config.in
  132. +67 −88 package/utils/busybox/config/modutils/Config.in
  133. +351 −375 package/utils/busybox/config/networking/Config.in
  134. +54 −32 package/utils/busybox/config/networking/udhcp/Config.in
  135. +142 −142 package/utils/busybox/config/procps/Config.in
  136. +7 −0 package/utils/busybox/config/runit/Config.in
  137. +13 −28 package/utils/busybox/config/selinux/Config.in
  138. +262 −191 package/utils/busybox/config/shell/Config.in
  139. +1 −2 package/utils/busybox/config/sysklogd/Config.in
  140. +425 −303 package/utils/busybox/config/util-linux/Config.in
  141. +6 −131 package/utils/busybox/config/util-linux/volume_id/Config.in
  142. +1 −1 package/utils/busybox/files/sysntpd
  143. +0 −37 package/utils/busybox/patches/002-libbb-send_to_from-do-not-require-that-to-should-hav.patch
  144. +0 −20 package/utils/busybox/patches/102-trylink_mktemp_fix.patch
  145. +0 −12 package/utils/busybox/patches/120-remove_uclibc_rpc_check.patch
  146. +2 −2 package/utils/busybox/patches/200-udhcpc_reduce_msgs.patch
  147. +1 −1 package/utils/busybox/patches/201-udhcpc_changed_ifindex.patch
  148. +1 −1 package/utils/busybox/patches/203-udhcpc_renew_no_deconfig.patch
  149. +15 −39 package/utils/busybox/patches/210-add_netmsg_util.patch
  150. +15 −39 package/utils/busybox/patches/220-add_lock_util.patch
  151. +952 −0 package/utils/busybox/patches/230-add_nslookup_lede.patch
  152. +1 −1 package/utils/busybox/patches/240-telnetd_intr.patch
  153. +6 −6 package/utils/busybox/patches/250-date-k-flag.patch
  154. +1 −1 package/utils/busybox/patches/301-ip-link-fix-netlink-msg-size.patch
  155. +0 −100 package/utils/busybox/patches/302-netlink-alignment.patch
  156. +0 −486 package/utils/busybox/patches/303-ip-route-fix-high-table-ids.patch
  157. +13 −0 package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch
  158. +11 −0 package/utils/busybox/patches/510-move-passwd-applet-to-bin.patch
  159. +1 −1 package/utils/bzip2/Makefile
  160. +3 −2 package/utils/e2fsprogs/Makefile
  161. +4 −1 package/utils/f2fs-tools/Makefile
  162. +0 −19 package/utils/f2fs-tools/patches/001-compile.patch
  163. +0 −10 package/utils/f2fs-tools/patches/010-include-byteswap-h.patch
  164. +66 −0 package/utils/f2fs-tools/patches/100-f2fs-WARNING-at-fs-f2fs-segment.c-718-update_sit_ent.patch
  165. +7 −3 package/utils/fritz-tools/src/fritz_tffs_read.c
  166. +2 −1 package/utils/mdadm/Makefile
  167. +1 −1 package/utils/mtd-utils/Makefile
  168. +30 −21 package/utils/nvram/src/cli.c
  169. +3 −0 package/utils/nvram/src/nvram.c
  170. +7 −2 package/utils/usbmode/Makefile
  171. +10 −6 package/utils/util-linux/Makefile
  172. +2 −2 package/utils/util-linux/patches/003-fix_pkgconfig_files.patch
  173. +3 −6 package/utils/util-linux/patches/600-entware-paths.patch
  174. +19 −14 scripts/bundle-libraries.sh
  175. +7 −6 scripts/download.pl
  176. +35 −0 scripts/gen_image_generic.sh
  177. +71 −1 scripts/metadata.pm
  178. +1 −1 scripts/om-fwupgradecfg-gen.sh
  179. +0 −24 scripts/openbsd.sh
  180. +37 −6 scripts/package-metadata.pl
  181. +0 −8 toolchain/Config.in
  182. +1 −1 toolchain/Makefile
  183. +3 −3 toolchain/gdb/Makefile
  184. +0 −51 toolchain/insight/Makefile
  185. +0 −31 toolchain/insight/patches/600-fix-compile-flag-mismatch.patch
  186. +3 −3 tools/automake/Makefile
  187. +4 −4 tools/automake/patches/000-relocatable.patch
  188. +25 −0 tools/bison/patches/001-fix-macos-vasnprintf.patch
  189. +25 −0 tools/coreutils/patches/001-fix-macos-vasnprintf.patch
  190. +2 −2 tools/e2fsprogs/Makefile
  191. +2 −2 tools/expat/Makefile
  192. +1 −2 tools/firmware-utils/Makefile
  193. +19 −1 tools/firmware-utils/src/addpattern.c
  194. +2 −3 tools/firmware-utils/src/dgn3500sum.c
  195. +26 −4 tools/firmware-utils/src/hcsmakeimage.c
  196. +0 −1 tools/firmware-utils/src/imagetag.c
  197. +23 −1 tools/firmware-utils/src/jcgimage.c
  198. +18 −4 tools/firmware-utils/src/mkchkimg.c
  199. +0 −1 tools/firmware-utils/src/mkrtn56uimg.c
  200. +0 −352 tools/firmware-utils/src/mktplinkfw-kernel.c
  201. +53 −58 tools/firmware-utils/src/mktplinkfw.c
  202. +101 −55 tools/firmware-utils/src/mktplinkfw2.c
  203. +0 −1 tools/firmware-utils/src/spw303v.c
  204. +305 −6 tools/firmware-utils/src/tplink-safeloader.c
  205. +0 −1 tools/firmware-utils/src/xorimage.c
  206. +0 −1 tools/firmware-utils/src/zyxbcm.c
  207. +2 −1 tools/flex/Makefile
  208. +2 −2 tools/flex/patches/100-disable-tests-docs.patch
  209. +25 −0 tools/m4/patches/001-fix-macos-vasnprintf.patch
  210. +67 −0 tools/mkimage/patches/110-fix_musl_build.patch
  211. +62 −0 tools/mtd-utils/patches/320-mkfs.jffs2-SOURCE_DATE_EPOCH.patch
  212. +25 −0 tools/patch/patches/001-fix-macos-vasnprintf.patch
  213. +2 −2 tools/pkg-config/Makefile
  214. +0 −18 tools/pkg-config/patches/001-glib-gdate-suppress-string-format-literal-warning.patch
  215. +4 −4 tools/sparse/Makefile
  216. +25 −0 tools/tar/patches/001-fix-macos-vasnprintf.patch
  217. +10 −0 tools/tar/patches/110-symlink-force-permissions.patch
View
@@ -1,7 +1,6 @@
commit 43e4e1f4a530dd9a03fdad55ef62fe9c379561bf
Author: Filip Moc <lede@moc6.cz>
Date: Thu May 25 21:55:32 2017 +0200
commit 9c500db89680af5d89fb679e08452c8f090d804d
Author: Jiawei Wang <me@jwang.link>
Date: Wed Sep 13 14:04:22 2017 +0800
Move enablemodem from ramips to new package adb-enablemodem and make it used also by TL-MR6400
ramips: fix used MAC addresses for Phicomm K2P
Signed-off-by: Filip Moc <lede@moc6.cz>
View
@@ -9,15 +9,16 @@ menu "Global build settings"
config ALL_NONSHARED
bool "Select all target specific packages by default"
default ALL || BUILDBOT
select ALL_KMODS
default BUILDBOT
config ALL_KMODS
bool "Select all kernel module packages by default"
default ALL
config ALL
bool "Select all userspace packages by default"
default n
select ALL_KMODS
select ALL_NONSHARED
config BUILDBOT
bool "Set build defaults for automatic builds (e.g. via buildbot)"
View
@@ -242,7 +242,7 @@ menu "Target Images"
config TARGET_IMAGES_GZIP
bool "GZip images"
depends on TARGET_IMAGES_PAD || TARGET_ROOTFS_EXT4FS
depends on TARGET_IMAGES_PAD || TARGET_ROOTFS_EXT4FS || TARGET_x86
default y
comment "Image Options"
View
@@ -48,7 +48,7 @@ config KERNEL_ARM_PMU
depends on (arm || arm64)
config KERNEL_PERF_EVENTS
bool
bool "Compile the kernel with performance events and counters"
default n
select KERNEL_ARM_PMU if (arm || arm64)
@@ -170,10 +170,6 @@ config KERNEL_AIO
bool "Compile the kernel with asynchronous IO support"
default n
config KERNEL_DIRECT_IO
bool "Compile the kernel with direct IO support"
default n
config KERNEL_FHANDLE
bool "Compile the kernel with support for fhandle syscalls"
default n
@@ -235,6 +231,16 @@ config KERNEL_RELAY
config KERNEL_KEXEC
bool "Enable kexec support"
config KERNEL_PROC_VMCORE
bool
config KERNEL_CRASH_DUMP
depends on i386 || x86_64 || arm || armeb
select KERNEL_KEXEC
select KERNEL_PROC_VMCORE
bool "Enable support for kexec crashdump"
default y
config USE_RFKILL
bool "Enable rfkill support"
default RFKILL_SUPPORT
View
@@ -44,6 +44,11 @@ define Build/buffalo-dhp-image
mv $@.new $@
endef
define Build/eva-image
$(STAGING_DIR_HOST)/bin/lzma2eva $(KERNEL_LOADADDR) $(KERNEL_LOADADDR) $@ $@.new
mv $@.new $@
endef
define Build/netgear-chk
$(STAGING_DIR_HOST)/bin/mkchkimg \
-o $@.new \
@@ -62,6 +67,16 @@ define Build/netgear-dni
mv $@.new $@
endef
define Build/append-squashfs-fakeroot-be
rm -rf $@.fakefs $@.fakesquashfs
mkdir $@.fakefs
$(STAGING_DIR_HOST)/bin/mksquashfs-lzma \
$@.fakefs $@.fakesquashfs \
-noappend -root-owned -be -nopad -b 65536 \
$(if $(SOURCE_DATE_EPOCH),-fixed-time $(SOURCE_DATE_EPOCH))
cat $@.fakesquashfs >> $@
endef
# append a fake/empty rootfs uImage header, to fool the bootloaders
# rootfs integrity check
define Build/append-uImage-fakeroot-hdr
@@ -76,7 +91,7 @@ endef
define Build/tplink-safeloader
-$(STAGING_DIR_HOST)/bin/tplink-safeloader \
-B $(TPLINK_BOARD_NAME) \
-B $(TPLINK_BOARD_ID) \
-V $(REVISION) \
-k $(IMAGE_KERNEL) \
-r $@ \
@@ -218,6 +233,29 @@ define Build/sysupgrade-tar
$@
endef
define Build/tplink-v1-header
$(STAGING_DIR_HOST)/bin/mktplinkfw \
-c -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -L $(KERNEL_LOADADDR) \
-E $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
-m $(TPLINK_HEADER_VERSION) -N "$(VERSION_DIST)" -V $(REVISION) \
-k $@ -o $@.new $(1)
@mv $@.new $@
endef
define Build/tplink-v2-header
$(STAGING_DIR_HOST)/bin/mktplinkfw2 \
-c -V "ver. 2.0" -B $(TPLINK_BOARD_ID) $(1) -k $@ -o $@.new
@mv $@.new $@
endef
define Build/tplink-v2-image
$(STAGING_DIR_HOST)/bin/mktplinkfw2 \
-a 0x4 -j -V "ver. 2.0" -B $(TPLINK_BOARD_ID) $(1) \
-k $(IMAGE_KERNEL) -r $(IMAGE_ROOTFS) -o $@.new
cat $@.new >> $@
rm -rf $@.new
endef
json_quote=$(subst ','\'',$(subst ",\",$(1)))
#")')
metadata_devices=$(if $(1),$(subst "$(space)","$(comma)",$(strip $(foreach v,$(1),"$(call json_quote,$(v))"))))
View
@@ -48,6 +48,7 @@ endef
ifdef TARGET_PER_DEVICE_ROOTFS
define Image/Build/Profile/Filesystem
cp $(KDIR)/root.$(2)+pkg=$(3) $(KDIR)/root.$(2)
$(call Image/Build/$(2),$(2))
$(call Image/Build/Profile,$(1),$(2))
endef
else
View
@@ -106,6 +106,8 @@ $(eval $(call nf_add,IPT_FILTER,CONFIG_NETFILTER_XT_MATCH_STRING, $(P_XT)xt_stri
$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_DSCP, $(P_XT)xt_dscp))
$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_DSCP, $(P_XT)xt_DSCP))
$(eval $(call nf_add,IPT_HASHLIMIT,CONFIG_NETFILTER_XT_MATCH_HASHLIMIT, $(P_XT)xt_hashlimit))
$(eval $(call nf_add,IPT_RPFILTER,CONFIG_IP_NF_MATCH_RPFILTER, $(P_V4)ipt_rpfilter))
$(eval $(call nf_add,IPT_RPFILTER,CONFIG_IP6_NF_MATCH_RPFILTER, $(P_V6)ip6t_rpfilter))
$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_LENGTH, $(P_XT)xt_length))
$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_STATISTIC, $(P_XT)xt_statistic))
$(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_TCPMSS, $(P_XT)xt_tcpmss))
View
@@ -8,6 +8,11 @@ ifeq ($(TARGET_BUILD),1)
PKG_BUILD_DIR:=$(LINUX_DIR)
endif
ifneq ($(filter host-refresh refresh,$(MAKECMDGOALS)),)
override QUILT=1
override HOST_QUILT=1
endif
ifneq ($(PKG_BUILD_DIR),)
QUILT?=$(if $(wildcard $(PKG_BUILD_DIR)/.quilt_used),y)
ifneq ($(QUILT),)
@@ -36,11 +41,6 @@ FILES_DIR?=./files
HOST_PATCH_DIR?=$(PATCH_DIR)
HOST_FILES_DIR?=$(FILES_DIR)
ifneq ($(filter host-refresh refresh,$(MAKECMDGOALS)),)
override QUILT=1
override HOST_QUILT=1
endif
QUILT_CMD:=quilt --quiltrc=-
define filter_series
@@ -97,7 +97,13 @@ define Kernel/Patch/Default
$(if $(QUILT),rm -rf $(PKG_BUILD_DIR)/patches; mkdir -p $(PKG_BUILD_DIR)/patches)
$(if $(kernel_files),$(CP) $(kernel_files) $(LINUX_DIR)/)
find $(LINUX_DIR)/ -name \*.rej -or -name \*.orig | $(XARGS) rm -f
if [ -d $(GENERIC_PLATFORM_DIR)/patches$(if $(wildcard $(GENERIC_PLATFORM_DIR)/patches-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER)) ]; then \
echo "generic patches directory is present. please move your patches to the pending directory" ; \
exit 1; \
fi
$(call PatchDir,$(PKG_BUILD_DIR),$(GENERIC_BACKPORT_DIR),generic-backport/)
$(call PatchDir,$(PKG_BUILD_DIR),$(GENERIC_PATCH_DIR),generic/)
$(call PatchDir,$(PKG_BUILD_DIR),$(GENERIC_HACK_DIR),generic-hack/)
$(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR),platform/)
endef
@@ -124,7 +130,9 @@ define Quilt/Refresh/Kernel
echo "All kernel patches must start with either generic/ or platform/"; \
false; \
}
$(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(GENERIC_BACKPORT_DIR),generic-backport/)
$(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(GENERIC_PATCH_DIR),generic/)
$(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(GENERIC_HACK_DIR),generic-hack/)
$(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR),platform/)
endef
View
@@ -13,25 +13,3 @@ isset() {
eval "var=\"\${$1}\""
[ -n "$var" ]
}
trapret() {(
local retvals="$1"; shift
local cmd="$1"; shift
for retval in $(echo $retvals); do
local trap_$retval=1
done
"$cmd" "$@" || {
local retval="$?"
eval "trapped=\${trap_$retval}"
[ -n "$trapped" ] || {
return $retval
}
}
)}
md5s() {
cat "$@" | (
md5sum 2>/dev/null ||
md5
) | awk '{print $1}'
}
View
@@ -104,7 +104,9 @@ ifneq ($(TARGET_BUILD)$(if $(DUMP),,1),)
endif
GENERIC_PLATFORM_DIR := $(TOPDIR)/target/linux/generic
GENERIC_PATCH_DIR := $(GENERIC_PLATFORM_DIR)/patches$(if $(wildcard $(GENERIC_PLATFORM_DIR)/patches-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
GENERIC_BACKPORT_DIR := $(GENERIC_PLATFORM_DIR)/backport$(if $(wildcard $(GENERIC_PLATFORM_DIR)/backport-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
GENERIC_PATCH_DIR := $(GENERIC_PLATFORM_DIR)/pending$(if $(wildcard $(GENERIC_PLATFORM_DIR)/pending-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
GENERIC_HACK_DIR := $(GENERIC_PLATFORM_DIR)/hack$(if $(wildcard $(GENERIC_PLATFORM_DIR)/hack-$(KERNEL_PATCHVER)),-$(KERNEL_PATCHVER))
GENERIC_FILES_DIR := $(foreach dir,$(wildcard $(GENERIC_PLATFORM_DIR)/files $(GENERIC_PLATFORM_DIR)/files-$(KERNEL_PATCHVER)),"$(dir)")
__config_name_list = $(1)/config-$(KERNEL_PATCHVER) $(1)/config-default
View
@@ -23,6 +23,7 @@ HOSTCC ?= $(CC)
export REVISION
export SOURCE_DATE_EPOCH
export GIT_CONFIG_PARAMETERS='core.autocrlf=false'
export GIT_ASKPASS:=/bin/true
export MAKE_JOBSERVER=$(filter --jobserver%,$(MAKEFLAGS))
export GNU_HOST_NAME:=$(shell $(TOPDIR)/scripts/config.guess)
export HOST_OS:=$(shell uname)
@@ -176,7 +177,7 @@ else
DOWNLOAD_DIRS = package/download
endif
download: .config FORCE
download: .config FORCE $(if $(wildcard $(TOPDIR)/staging_dir/host/bin/flock),,tools/flock/compile)
@+$(foreach dir,$(DOWNLOAD_DIRS),$(SUBMAKE) $(dir);)
clean dirclean: .config
@@ -1,12 +1,5 @@
menu "Configuration"
depends on PACKAGE_kexec-tools
config KEXEC_TOOLS_kdump
bool
prompt "kdump support"
default n
help
Include the kdump utility.
depends on PACKAGE_kexec
config KEXEC_ZLIB
bool
@@ -8,35 +8,62 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=kexec-tools
PKG_VERSION:=2.0.14-rc1
PKG_VERSION:=2.0.14
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/utils/kernel/kexec
PKG_HASH:=3fc505ff8d8a2d24c68aac5e6b4783997d5a086966ff3de8b05a0ceb27e5e23b
PKG_HASH:=ffb2e7e99d9d08754c6bc1922aed3c000094f318665d82a72ecc76c4ff1c0dc6
PKG_FIXUP:=autoreconf
PKG_CONFIG_DEPENDS := CONFIG_KEXEC_ZLIB CONFIG_KEXEC_LZMA
include $(INCLUDE_DIR)/package.mk
define Package/kexec-tools
define Package/kexec-tools/Default
SECTION:=utils
CATEGORY:=Utilities
DEPENDS:=@armeb||@arm||@i386||@x86_64||@powerpc64||@mipsel||@mips +KEXEC_ZLIB:zlib +KEXEC_LZMA:liblzma
TITLE:=Kernel boots kernel
URL:=http://kernel.org/pub/linux/kernel/people/horms/kexec-tools/
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
MENU:=1
endef
define Package/kexec-tools
$(call Package/kexec-tools/Default)
TITLE:=kexec-tools transition meta package
DEPENDS:=+kexec
endef
define Package/kexec-tools/description
kexec is a set of systems call that allows you to load
kexec is a set of system calls that allows you to load
another kernel from the currently executing Linux kernel.
The kexec utility allows to load and boot another kernel.
endef
define Package/kexec
$(call Package/kexec-tools/Default)
TITLE:=Kernel boots kernel
DEPENDS:=\
@armeb||@arm||@i386||@x86_64||@powerpc64||@mipsel||@mips \
+KEXEC_ZLIB:zlib +KEXEC_LZMA:liblzma
endef
define Package/kexec/description
The kexec utility allows to load and boot another kernel.
endef
define Package/kexec-tools/config
define Package/kdump
$(call Package/kexec-tools/Default)
TITLE:=Kernel crash analysis
DEPENDS:=+kexec @i386||@x86_64||@arm @KERNEL_CRASH_DUMP
endef
define Package/kdump/description
The kdump package allows to automatically boot into a
special kernel for analyzing kernel crashes using kdump.
endef
define Package/kexec/config
source "$(SOURCE)/Config.in"
endef
@@ -65,20 +92,27 @@ CONFIGURE_VARS += \
BUILD_CC="$(HOSTCC)" \
TARGET_CC="$(TARGET_CC)"
kexec-extra-sbin-$(CONFIG_KEXEC_TOOLS_kdump) += kdump
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
endef
define Package/kexec-tools/install
:
endef
define Package/kexec/install
$(INSTALL_DIR) $(1)/opt/sbin
$(INSTALL_BIN) \
$(addprefix $(PKG_INSTALL_DIR)/opt/sbin/, \
$(kexec-extra-sbin-y)) \
$(kexec-extra-bin-y) \
$(PKG_INSTALL_DIR)/opt/sbin/kexec \
$(1)/opt/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/opt/sbin/kexec $(1)/opt/sbin
endef
define Package/kdump/install
$(INSTALL_DIR) $(1)/opt/sbin $(1)/etc/config
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/opt/sbin/kdump $(PKG_INSTALL_DIR)/opt/sbin/vmcore-dmesg $(1)/opt/sbin
$(INSTALL_BIN) ./files/kdump.defaults $(1)/etc/uci-defaults/kdump
$(INSTALL_CONF) ./files/kdump.config $(1)/etc/config/kdump
endef
$(eval $(call BuildPackage,kexec-tools))
$(eval $(call BuildPackage,kexec))
$(eval $(call BuildPackage,kdump))
@@ -0,0 +1,7 @@
config kdump
option enabled '1'
option save_dmesg '1'
option save_vmcore '0'
# using an external partition to store vmcore is highly recommended!
# option path '/mnt/crashdump'
Oops, something went wrong.

0 comments on commit ee8875d

Please sign in to comment.