Skip to content

Commit

Permalink
[bot] AutoMerging: merge all upstream's changes:
Browse files Browse the repository at this point in the history
* https://github.com/coolsnowwolf/lede:
  luci-app-qbittorrent: change x64 default use dynamic build
  libtorrent: bump to 1.2.15
  x86: add lspci and lsusb tools
  busybox: update to 1.33.2 bugfix release (coolsnowwolf#8386)
  Update Makefile (coolsnowwolf#8383)
  ramips: add support for RAISECOM MSG1500 Z.00 (coolsnowwolf#8385)
  • Loading branch information
github-actions[bot] committed Dec 5, 2021
2 parents 2f53049 + c591793 commit d571128
Show file tree
Hide file tree
Showing 8 changed files with 182 additions and 11 deletions.
2 changes: 1 addition & 1 deletion package/lean/luci-app-ipsec-vpnd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
include $(TOPDIR)/rules.mk

LUCI_TITLE:=LuCI support for IPSec VPN Server (IKEv1 with PSK and Xauth)
LUCI_DEPENDS:=+strongswan +strongswan-minimal +strongswan-mod-xauth-generic +strongswan-mod-kernel-libipsec
LUCI_DEPENDS:=+strongswan +strongswan-minimal +strongswan-mod-xauth-generic +strongswan-mod-kernel-libipsec +kmod-tun
LUCI_PKGARCH:=all
PKG_VERSION:=1.0
PKG_RELEASE:=11
Expand Down
4 changes: 2 additions & 2 deletions package/lean/luci-app-qbittorrent/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ LUCI_DEPENDS:= \
define Package/$(PKG_NAME)/config
choice
prompt "Build Version Selection"
default PACKAGE_luci-app-qbittorrent_static if arm||aarch64||x86_64
default PACKAGE_luci-app-qbittorrent_dynamic if !(arm||aarch64||x86_64)
default PACKAGE_luci-app-qbittorrent_static if arm||aarch64
default PACKAGE_luci-app-qbittorrent_dynamic if !(arm||aarch64)

config PACKAGE_luci-app-qbittorrent_static
bool "Static Build"
Expand Down
8 changes: 4 additions & 4 deletions package/lean/rblibtorrent/Makefile
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=rblibtorrent
PKG_VERSION:=1.2.14
PKG_RELEASE=2
PKG_VERSION:=1.2.15
PKG_RELEASE=1

PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/arvidn/libtorrent.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=33a10d5a723a6c27d9baee7d9bf2028eb81c88ed
PKG_SOURCE_VERSION:=9c5b26b8d9bdb168256566a2986c563187638e5a
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_MIRROR_HASH:=036e1d7bd26d48f3e085ab467893bd4f90cdf56ac744b35c4652ac2fed035ed2
PKG_MIRROR_HASH:=15c9d37a56cf09b22b9d1eeec8a0c21eff7c9fb6b30b04c4cba9a61d5201d57a

PKG_LICENSE:=BSD
PKG_LICENSE_FILES:=COPYING
Expand Down
4 changes: 2 additions & 2 deletions package/utils/busybox/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=busybox
PKG_VERSION:=1.33.1
PKG_VERSION:=1.33.2
PKG_RELEASE:=$(AUTORELEASE)
PKG_FLAGS:=essential

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://www.busybox.net/downloads \
http://sources.buildroot.net
PKG_HASH:=12cec6bd2b16d8a9446dd16130f2b92982f1819f6e1c5f5887b6db03f5660d28
PKG_HASH:=6843ba7977081e735fa0fdb05893e3c002c8c5ad7c9c80da206e603cc0ac47e7

PKG_BUILD_DEPENDS:=BUSYBOX_CONFIG_PAM:libpam
PKG_BUILD_PARALLEL:=1
Expand Down
160 changes: 160 additions & 0 deletions target/linux/ramips/dts/mt7621_raisecom_msg1500-z-00.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
#include "mt7621.dtsi"

#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>

/ {
compatible = "raisecom,msg1500-z-00", "mediatek,mt7621-soc";
model = "RAISECOM MSG1500 Z.00";

aliases {
led-boot = &led_wps;
led-failsafe = &led_wps;
led-upgrade = &led_wps;
};

chosen {
bootargs = "console=ttyS0,115200";
};

leds {
compatible = "gpio-leds";

internet {
label = "blue:internet";
gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
};

wlan2g {
label = "blue:wlan2g";
gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
};

wlan5g {
label = "blue:wlan5g";
gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
};

led_wps: wps {
label = "blue:wps";
gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
};
};

keys {
compatible = "gpio-keys";

reset {
label = "reset";
gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
linux,code = <KEY_RESTART>;
};

wps {
label = "wps";
gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
linux,code = <KEY_WPS_BUTTON>;
};
};
};

&spi0 {
status = "okay";

flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <10000000>;

partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;

partition@0 {
label = "u-boot";
reg = <0x0 0x30000>;
read-only;
};

partition@30000 {
label = "u-boot-env";
reg = <0x30000 0x10000>;
read-only;
};

factory: partition@40000 {
label = "factory";
reg = <0x40000 0x10000>;
read-only;
};

partition@50000 {
compatible = "denx,uimage";
label = "firmware";
reg = <0x50000 0xfb0000>;
};
};
};
};

&pcie {
status = "okay";
};

&pcie0 {
mt76@0,0 {
reg = <0x0000 0 0 0 0>;
mediatek,mtd-eeprom = <&factory 0x8000>;
ieee80211-freq-limit = <5000000 6000000>;
};
};

&pcie1 {
mt76@0,0 {
reg = <0x0000 0 0 0 0>;
mediatek,mtd-eeprom = <&factory 0x0000>;
ieee80211-freq-limit = <2400000 2500000>;
};
};

&gmac0 {
mtd-mac-address = <&factory 0xe000>;
};

&switch0 {
ports {
port@0 {
status = "okay";
label = "lan1";
};

port@1 {
status = "okay";
label = "lan2";
};

port@2 {
status = "okay";
label = "lan3";
};

port@3 {
status = "okay";
label = "lan4";
};

port@4 {
status = "okay";
label = "wan";
mtd-mac-address = <&factory 0x8004>;
};
};
};

&state_default {
gpio {
groups = "jtag", "wdt";
function = "gpio";
};
};
10 changes: 10 additions & 0 deletions target/linux/ramips/image/mt7621.mk
Original file line number Diff line number Diff line change
Expand Up @@ -1253,6 +1253,16 @@ define Device/raisecom_msg1500-x-00
endef
TARGET_DEVICES += raisecom_msg1500-x-00

define Device/raisecom_msg1500-z-00
$(Device/dsa-migration)
IMAGE_SIZE := 16064k
DEVICE_VENDOR := RAISECOM
DEVICE_MODEL := MSG1500
DEVICE_VARIANT := Z.00
DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3
endef
TARGET_DEVICES += raisecom_msg1500-z-00

define Device/samknows_whitebox-v8
$(Device/dsa-migration)
IMAGE_SIZE := 16064k
Expand Down
1 change: 1 addition & 0 deletions target/linux/ramips/mt7621/base-files/etc/board.d/01_leds
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ d-team,newifi-d2)
;;
d-team,pbr-m1|\
jcg,y2|\
raisecom,msg1500-z-00|\
xzwifi,creativebox-v1)
ucidef_set_led_netdev "internet" "internet" "blue:internet" "wan"
;;
Expand Down
4 changes: 2 additions & 2 deletions target/linux/x86/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ KERNELNAME:=bzImage

include $(INCLUDE_DIR)/target.mk

DEFAULT_PACKAGES += partx-utils mkf2fs e2fsprogs kmod-button-hotplug wpad kmod-usb-hid kmod-mmc-spi kmod-sdhci \
DEFAULT_PACKAGES += partx-utils mkf2fs e2fsprogs kmod-button-hotplug wpad kmod-usb-hid kmod-mmc-spi kmod-sdhci usbutils pciutils \
kmod-ath5k kmod-ath9k kmod-ath9k-htc kmod-ath10k kmod-rt2800-usb kmod-alx kmod-e1000e kmod-igb kmod-igc kmod-igbvf kmod-ixgbe kmod-ixgbevf kmod-iavf kmod-bnx2x kmod-pcnet32 kmod-tulip kmod-via-velocity kmod-vmxnet3 kmod-i40e kmod-i40evf kmod-r8125 kmod-8139cp kmod-8139too kmod-fs-f2fs cfdisk \
htop lm-sensors autocore-x86 automount autosamba luci-app-adbyby-plus luci-app-ipsec-vpnd luci-proto-bonding \
luci-app-unblockmusic luci-app-zerotier luci-app-xlnetacc ddns-scripts_aliyun ddns-scripts_dnspod ca-bundle luci-app-wireguard luci-app-qbittorrent luci-app-dockerman luci-app-ttyd \
luci-app-unblockmusic luci-app-zerotier luci-app-xlnetacc ddns-scripts_aliyun ddns-scripts_dnspod ca-bundle luci-app-wireguard luci-app-qbittorrent luci-app-ttyd \
ath10k-firmware-qca988x ath10k-firmware-qca9888 ath10k-firmware-qca9984 brcmfmac-firmware-43602a1-pcie \
kmod-sound-hda-core kmod-sound-hda-codec-realtek kmod-sound-hda-codec-via kmod-sound-via82xx kmod-sound-hda-intel kmod-sound-hda-codec-hdmi kmod-sound-i8x0 kmod-usb-audio \
kmod-usb-net kmod-usb-net-asix kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8150 kmod-usb-net-rtl8152-vendor kmod-mlx4-core kmod-mlx5-core
Expand Down

0 comments on commit d571128

Please sign in to comment.