fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Mainline

Browse Source
This commit is contained in:
CN_SZTL 2020-06-06 22:28:48 +08:00
commit bef3c8f54e
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
27 changed files with 204 additions and 434 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/kernel-version.mk
View File

@ -6,14 +6,14 @@ ifdef CONFIG_TESTING_KERNEL
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
endif
LINUX_VERSION-4.9 = .225
LINUX_VERSION-4.14 = .182
LINUX_VERSION-4.19 = .125
LINUX_VERSION-4.9 = .226
LINUX_VERSION-4.14 = .183
LINUX_VERSION-4.19 = .126
LINUX_VERSION-5.4 = .43
LINUX_KERNEL_HASH-4.9.225 = e547748c548b0f55f665bc78cfec322e7b96f41527b5e4b5d79430fdaa57c3e8
LINUX_KERNEL_HASH-4.14.182 = 671d1f1d5ad0ae74fb21ee70a5544400e7d6270098d3f8b134484ded2c3e5b90
LINUX_KERNEL_HASH-4.19.125 = 9843f40efb37491770688810d153d0779daed8eb097773a0de5abf2cb0d1bd7e
LINUX_KERNEL_HASH-4.9.226 = 460a8c168fe5c60ce5b30015a4e4bf348d93a89f8b949de1f90779567ef345ca
LINUX_KERNEL_HASH-4.14.183 = 4265afef56819b04656107a5abecde205c5bc5fb04b2e81447955e7e45db8085
LINUX_KERNEL_HASH-4.19.126 = 6e2a7e0adbe31e39cc8f1a3bd7bfa0d92ec0a4ca5360bb25829db831378f3f89
LINUX_KERNEL_HASH-5.4.43 = 2667b90a42d42557aca9e3d37bba1b4e71809b9523958e6870ada311c4790744
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))

4
package/ctcgfw/luci-app-rclone/Makefile
View File

@ -10,10 +10,10 @@
include $(TOPDIR)/rules.mk
LUCI_TITLE:=LuCI support for Rclone
LUCI_DEPENDS:=+rclone +rclone-webui-react
LUCI_DEPENDS:=+rclone +rclone-webui-react +rclone-ng +fuse-utils
LUCI_PKGARCH:=all
PKG_NAME:=luci-app-rclone
PKG_VERSION:=1.3.22
PKG_VERSION:=1.4.0
PKG_RELEASE:=1
PKG_LICENSE:=GPLv3.0+
PKG_MAINTAINER:=ElonH <elonhhuang@gmail.com>

11
package/ctcgfw/luci-app-rclone/luasrc/model/cbi/rclone.lua
View File

@ -38,10 +38,13 @@ m =
translate('Rclone ("rsync for cloud storage") is a command line program to sync root/usr/bin and directories to and from different cloud storage providers.') ..
' <br/> <br/> ' .. translate('rclone state') .. ' : ' .. state_msg .. '<br/> <br/>'
.. address_msg ..
translate('Installed Web Interface') ..
'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" class="cbi-button" style="margin: 0 5px;" value=" ' ..
translate('Webui React') ..
" \" onclick=\"window.open('http://'+window.location.hostname+'/rclone-webui-react')\"/> <br/><br/>"
translate('Installed Web Interface') ..
'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" class="cbi-button" style="margin: 0 5px;" value=" ' ..
translate('Webui React') ..
" \" onclick=\"window.open('http://'+window.location.hostname+'/rclone-webui-react')\"/>" ..
'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" class="cbi-button" style="margin: 0 5px;" value=" ' ..
translate('RcloneNg') ..
" \" onclick=\"window.open('http://'+window.location.hostname+'/RcloneNg')\"/> <br/><br/>"
)
s = m:section(TypedSection, 'global', translate('global'))

50
package/ctcgfw/luci-app-rclone/po/zh-cn/luci-app-rclone.po
View File

@ -11,7 +11,7 @@ msgstr ""
"PO-Revision-Date: \n"
"X-Generator: Poedit 2.0.6\n"
#: luasrc/model/cbi/rclone.lua:118
#: luasrc/model/cbi/rclone.lua:121
msgid "FAQ"
msgstr "常见问题"
@ -34,11 +34,15 @@ msgid ""
msgstr ""
"Rclone是一款的命令行工具，支持在不同对象存储、网盘间同步、上传、下载数据。"
#: luasrc/model/cbi/rclone.lua:75
#: luasrc/model/cbi/rclone.lua:46
msgid "RcloneNg"
msgstr "RcloneNg"
#: luasrc/model/cbi/rclone.lua:78
msgid "Recommand: run"
msgstr "建议: 在 PC 上运行"
#: luasrc/model/cbi/rclone.lua:127
#: luasrc/model/cbi/rclone.lua:130
msgid ""
"The content of the variable is protocol://server:port. The protocol value is "
"commonly either http or socks5."
@ -50,63 +54,63 @@ msgstr ""
msgid "Webui React"
msgstr "Webui React"
#: luasrc/model/cbi/rclone.lua:61
#: luasrc/model/cbi/rclone.lua:64
msgid "all address"
msgstr "全部地址"
#: luasrc/model/cbi/rclone.lua:54
#: luasrc/model/cbi/rclone.lua:57
msgid "configure"
msgstr "配置"
#: luasrc/model/cbi/rclone.lua:80
#: luasrc/model/cbi/rclone.lua:83
msgid "download"
msgstr "下载"
#: luasrc/model/cbi/rclone.lua:79
#: luasrc/model/cbi/rclone.lua:82
msgid "download configuration"
msgstr "下载配置文件"
#: luasrc/model/cbi/rclone.lua:120
#: luasrc/model/cbi/rclone.lua:123
msgid "enable proxy"
msgstr "启用代理"
#: luasrc/model/cbi/rclone.lua:47
#: luasrc/model/cbi/rclone.lua:50
msgid "global"
msgstr "全局"
#: luasrc/model/cbi/rclone.lua:58
#: luasrc/model/cbi/rclone.lua:61
msgid "listen address"
msgstr "监听地址"
#: luasrc/model/cbi/rclone.lua:65
#: luasrc/model/cbi/rclone.lua:68
msgid "listen port"
msgstr "监听端口"
#: luasrc/model/cbi/rclone.lua:60
#: luasrc/model/cbi/rclone.lua:63
msgid "local network address"
msgstr "局域网地址"
#: luasrc/model/cbi/rclone.lua:59
#: luasrc/model/cbi/rclone.lua:62
msgid "localhost address"
msgstr "本机地址"
#: luasrc/model/cbi/rclone.lua:129
#: luasrc/model/cbi/rclone.lua:132
msgid "log"
msgstr "日志"
#: luasrc/model/cbi/rclone.lua:108
#: luasrc/model/cbi/rclone.lua:111
msgid "password"
msgstr "密码"
#: luasrc/model/cbi/rclone.lua:133
#: luasrc/model/cbi/rclone.lua:136
msgid "path"
msgstr "路径"
#: luasrc/model/cbi/rclone.lua:114
#: luasrc/model/cbi/rclone.lua:117
msgid "proxy"
msgstr "代理"
#: luasrc/model/cbi/rclone.lua:123
#: luasrc/model/cbi/rclone.lua:126
msgid "proxy address"
msgstr "代理地址"
@ -114,7 +118,7 @@ msgstr "代理地址"
msgid "rclone address"
msgstr "rclone 地址"
#: luasrc/model/cbi/rclone.lua:71
#: luasrc/model/cbi/rclone.lua:74
msgid "rclone configuration file path"
msgstr "rclone 配置文件地址"
@ -130,19 +134,19 @@ msgstr "rclone 运行中"
msgid "rclone state"
msgstr "rclone 状态"
#: luasrc/model/cbi/rclone.lua:51
#: luasrc/model/cbi/rclone.lua:54
msgid "run Rclone as daemon"
msgstr "启动 rclone 后台服务"
#: luasrc/model/cbi/rclone.lua:77
#: luasrc/model/cbi/rclone.lua:80
msgid "than updaload configuration to here."
msgstr "然后上传配置文件到这里"
#: luasrc/model/cbi/rclone.lua:77
#: luasrc/model/cbi/rclone.lua:80
msgid "to setup configuration on pc,"
msgstr "命令设置 rclone 配置文件,"
#: luasrc/model/cbi/rclone.lua:103
#: luasrc/model/cbi/rclone.lua:106
msgid "username"
msgstr "用户名"

58
package/ctcgfw/rclone-ng/Makefile Normal file
View File

@ -0,0 +1,58 @@
####
# File: /rclone-ng/Makefile
# Project: Rclone-OpenWrt
# File Created: Friday, 5th June 2020 12:37:26 am
# Author: ElonH[EH](elonhhuang@gmail.com)
# License: GNU General Public License v3.0 or later(http://www.gnu.org/licenses/gpl-3.0-standalone.html)
# Copyright (C) 2020 [ElonH]
####
include $(TOPDIR)/rules.mk
PKG_NAME:=rclone-ng
PKG_VERSION:=0.2.4
PKG_RELEASE:=1
PKG_LICENSE:=GPLv3
PKG_MAINTAINER:=ElonH <elonhhuang@gmail.com>
include $(INCLUDE_DIR)/package.mk
PKG_SOURCE:=RcloneNg-v$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/ElonH/RcloneNg/releases/download/v$(PKG_VERSION)/
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_HASH:=3090a713253b17bfbb4d6a69b4b55b81d69e1768cf56d3abca8631e4a35f270b
define Package/$(PKG_NAME)
SECTION:=net
CATEGORY:=Network
SUBMENU:=File Transfer
SUBMENU:=Cloud Manager
TITLE:=An angular web application for rclone
URL:=https://github.com/ElonH/RcloneNg
PKGARCH:=all
endef
define Package/$(PKG_NAME)/description
An angular web application for rclone
endef
define Build/Prepare
mkdir -vp $(PKG_BUILD_DIR)
tar -xzf $(DL_DIR)/$(PKG_SOURCE) -C $(PKG_BUILD_DIR)
endef
define Build/Configure
endef
define Build/Compile
echo "$(PKG_NAME) Compile Skiped!"
endef
define Package/$(PKG_NAME)/install
$(INSTALL_DIR) $(1)/www
$(CP) $(PKG_BUILD_DIR)/RcloneNg $(1)/www
endef
$(eval $(call BuildPackage,$(PKG_NAME)))

94
package/kernel/linux/modules/iio.mk
View File

@ -328,20 +328,88 @@ endef
$(eval $(call KernelPackage,iio-st_accel))
define KernelPackage/iio-st_sensors-i2c
define KernelPackage/iio-st_accel-i2c
SUBMENU:=$(IIO_MENU)
TITLE:=STMicroelectronics accelerometer 3-Axis Driver (I2C)
DEPENDS:=+kmod-iio-st_accel +kmod-i2c-core +kmod-regmap-i2c
KCONFIG:= CONFIG_IIO_ST_ACCEL_I2C_3AXIS
FILES:=$(LINUX_DIR)/drivers/iio/common/st_sensors/st_sensors_i2c.ko
AUTOLOAD:=$(call AutoLoad,56,st_sensors_i2c)
FILES:= \
$(LINUX_DIR)/drivers/iio/accel/st_accel_i2c.ko \
$(LINUX_DIR)/drivers/iio/common/st_sensors/st_sensors_i2c.ko
AUTOLOAD:=$(call AutoLoad,56,st_accel_i2c)
endef
define KernelPackage/iio-st_sensors-i2c/description
define KernelPackage/iio-st_accel-i2c/description
This package adds support for STMicroelectronics I2C based accelerometers
endef
$(eval $(call KernelPackage,iio-st_sensors-i2c))
$(eval $(call KernelPackage,iio-st_accel-i2c))
define KernelPackage/iio-st_accel-spi
SUBMENU:=$(IIO_MENU)
TITLE:=STMicroelectronics accelerometer 3-Axis Driver (SPI)
DEPENDS:=+kmod-iio-st_accel +kmod-regmap-spi
KCONFIG:= CONFIG_IIO_ST_ACCEL_SPI_3AXIS
FILES:= \
$(LINUX_DIR)/drivers/iio/accel/st_accel_spi.ko \
$(LINUX_DIR)/drivers/iio/common/st_sensors/st_sensors_spi.ko
AUTOLOAD:=$(call AutoLoad,56,st_accel_spi)
endef
define KernelPackage/iio-st_accel-spi/description
This package adds support for STMicroelectronics SPI based accelerometers
endef
$(eval $(call KernelPackage,iio-st_accel-spi))
define KernelPackage/iio-lsm6dsx
SUBMENU:=$(IIO_MENU)
DEPENDS:=+kmod-iio-core +kmod-iio-kfifo-buf +kmod-regmap-core
TITLE:=ST LSM6DSx driver for IMU MEMS sensors
KCONFIG:=CONFIG_IIO_ST_LSM6DSX
FILES:=$(LINUX_DIR)/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.ko
AUTOLOAD:=$(call AutoProbe,st_lsm6dsx)
endef
define KernelPackage/iio-lsm6dsx/description
Support for the ST LSM6DSx and related IMU MEMS sensors.
endef
$(eval $(call KernelPackage,iio-lsm6dsx))
define KernelPackage/iio-lsm6dsx-i2c
SUBMENU:=$(IIO_MENU)
DEPENDS:=+kmod-iio-lsm6dsx +kmod-i2c-core +kmod-regmap-i2c
TITLE:=ST LSM6DSx driver for IMU MEMS sensors (I2C)
KCONFIG:=CONFIG_IIO_ST_LSM6DSX
FILES:=$(LINUX_DIR)/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.ko
AUTOLOAD:=$(call AutoProbe,st_lsm6dsx-i2c)
endef
define KernelPackage/iio-lsm6dsx-i2c/description
Support for the ST LSM6DSx and related IMU MEMS I2C sensors.
endef
$(eval $(call KernelPackage,iio-lsm6dsx-i2c))
define KernelPackage/iio-lsm6dsx-spi
SUBMENU:=$(IIO_MENU)
DEPENDS:=+kmod-iio-lsm6dsx +kmod-regmap-spi
TITLE:=ST LSM6DSx driver for IMU MEMS sensors (SPI)
KCONFIG:=CONFIG_IIO_ST_LSM6DSX
FILES:=$(LINUX_DIR)/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.ko
AUTOLOAD:=$(call AutoProbe,st_lsm6dsx-spi)
endef
define KernelPackage/iio-lsm6dsx-spi/description
Support for the ST LSM6DSx and related IMU MEMS SPI sensors.
endef
$(eval $(call KernelPackage,iio-lsm6dsx-spi))
define KernelPackage/iio-sps30
@ -360,22 +428,6 @@ endef
$(eval $(call KernelPackage,iio-sps30))
define KernelPackage/iio-st_sensors-spi
SUBMENU:=$(IIO_MENU)
TITLE:=STMicroelectronics accelerometer 3-Axis Driver (SPI)
DEPENDS:=+kmod-iio-st_accel +kmod-regmap-spi
KCONFIG:= CONFIG_IIO_ST_ACCEL_SPI_3AXIS
FILES:=$(LINUX_DIR)/drivers/iio/common/st_sensors/st_sensors_spi.ko
AUTOLOAD:=$(call AutoLoad,56,st_sensors_spi)
endef
define KernelPackage/iio-st_sensors-spi/description
This package adds support for STMicroelectronics SPI based accelerometers
endef
$(eval $(call KernelPackage,iio-st_sensors-spi))
define KernelPackage/iio-tsl4531
SUBMENU:=$(IIO_MENU)
DEPENDS:=+kmod-i2c-core +kmod-iio-core

28
package/lean/autocore/Makefile
View File

@ -9,15 +9,14 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=autocore
PKG_VERSION:=1
PKG_RELEASE:=32
PKG_RELEASE:=33
include $(INCLUDE_DIR)/package.mk
define Package/autocore-raspberrypi
TITLE:=RaspberryPi auto core loadbalance script.
define Package/autocore-arm
TITLE:=Arm auto core loadbalance script.
MAINTAINER:=CN_SZTL
DEPENDS:=@TARGET_bcm27xx +bcm27xx-userland
DEPENDS:=@(TARGET_bcm27xx||TARGET_ipq806x)
endef
define Package/autocore-x86
@ -26,23 +25,24 @@ define Package/autocore-x86
DEPENDS:=@TARGET_x86 +bc +lm-sensors +ethtool
endef
define Package/autocore/description
A usb autoconfig hotplug script.
define Package/autocore-arm/description
A luci autoconfig hotplug script.
endef
Package/autocore-x86/description = $(call Package/autocore/description)
Package/autocore-raspberrypi/description = $(call Package/autocore/description)
define Package/autocore-x86/description
A usb autoconfig hotplug script.
endef
define Build/Compile
endef
define Package/autocore-raspberrypi/install
define Package/autocore-arm/install
$(INSTALL_DIR) $(1)/etc
$(INSTALL_DATA) ./files/raspberrypi/index.htm $(1)/etc/index.htm
$(INSTALL_DATA) ./files/arm/index.htm $(1)/etc/index.htm
$(INSTALL_DIR) $(1)/etc/uci-defaults
$(INSTALL_BIN) ./files/raspberrypi/090-cover-index_htm $(1)/etc/uci-defaults/090-cover-index_htm
$(INSTALL_BIN) ./files/arm/090-cover-index_htm $(1)/etc/uci-defaults/090-cover-index_htm
$(INSTALL_DIR) $(1)/sbin
$(CP) ./files/raspberrypi/sbin/* $(1)/sbin
$(CP) ./files/arm/sbin/* $(1)/sbin
endef
define Package/autocore-x86/install
@ -54,5 +54,5 @@ define Package/autocore-x86/install
$(CP) ./files/x86/sbin/* $(1)/sbin
endef
$(eval $(call BuildPackage,autocore-raspberrypi))
$(eval $(call BuildPackage,autocore-arm))
$(eval $(call BuildPackage,autocore-x86))

0
package/lean/autocore/files/raspberrypi/090-cover-index_htm → package/lean/autocore/files/arm/090-cover-index_htm
View File

0
package/lean/autocore/files/raspberrypi/index.htm → package/lean/autocore/files/arm/index.htm
View File

6
package/lean/autocore/files/arm/sbin/cpuinfo Executable file
View File

@ -0,0 +1,6 @@
#!/bin/sh
cpu_freq="$(expr $(cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq) / 1000)Mhz"
sys_temp="$(awk "BEGIN{printf (\"%.1f\n\",$(cat /sys/class/thermal/thermal_zone0/temp)/1000) }")°C"
echo -n "(${cpu_freq}, ${sys_temp})"

11
package/lean/autocore/files/raspberrypi/sbin/cpuinfo
View File

@ -1,11 +0,0 @@
#!/bin/sh
if command -v vcgencmd >/dev/null; then
cpu_freq="$(vcgencmd get_config arm_freq | awk -F '=' '{print $2}')Mhz"
sys_temp="$(vcgencmd measure_temp | grep -Eo '[0-9.]+')°C"
else
cpu_freq="$(expr $(cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq) / 1000)Mhz"
sys_temp="$(awk "BEGIN{printf (\"%.1f\n\",$(cat /sys/class/thermal/thermal_zone0/temp)/1000) }")°C"
fi
echo -n "(${cpu_freq}, ${sys_temp})"

3
package/lean/autocore/files/x86/sbin/cpuinfo
View File

@ -4,13 +4,10 @@ info()
{
MHz=`grep 'MHz' /proc/cpuinfo | cut -c11- |sed -n '1p'`
#获取CPU工作频率
sensors >/dev/null
if [ $? -eq 0 ];then
a=`sensors | grep 'Core 0' | cut -c10-24`
#获取CPU核心1温度
else
a=""
fi

2
package/lean/default-settings/files/openwrt_banner
View File

@ -8,5 +8,5 @@
│ # │
│ " │
│─────────────────────────────────────────────────│
│ OpenWrt 18.06 by Lean | Mod 20.05 By CTCGFW │
│ OpenWrt 18.06 by Lean | Mod 20.06 By CTCGFW │
└─────────────────────────────────────────────────┘

2
package/lean/default-settings/files/zzz-default-settings
View File

@ -45,7 +45,7 @@ sed -i '/option disabled/d' /etc/config/wireless
sed -i '/set wireless.radio${devidx}.disabled/d' /lib/wifi/mac80211.sh
sed -i '/DISTRIB_REVISION/d' /etc/openwrt_release
echo "DISTRIB_REVISION='| Mod20.05 by CTCGFW'" >> /etc/openwrt_release
echo "DISTRIB_REVISION='| Mod20.06 by CTCGFW'" >> /etc/openwrt_release
sed -i '/DISTRIB_DESCRIPTION/d' /etc/openwrt_release
echo "DISTRIB_DESCRIPTION='OpenWrt 18.06 by Lean '" >> /etc/openwrt_release

60
package/libs/libconfig/Makefile
View File

@ -1,60 +0,0 @@
#
# Copyright (C) 2008-2012 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=libconfig
PKG_VERSION:=1.7.2
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://hyperrealm.github.io/libconfig/dist/
PKG_HASH:=7c3c7a9c73ff3302084386e96f903eb62ce06953bb1666235fac74363a16fad9
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_LICENSE:=LGPL-2.1+
include $(INCLUDE_DIR)/package.mk
define Package/libconfig
SECTION:=libs
CATEGORY:=Libraries
TITLE:=Configuration File Library
URL:=http://www.hyperrealm.com/libconfig/
ABI_VERSION:=11
endef
define Package/libconfig/description
Libconfig is a simple library for manipulating structured configuration
files. This file format is more compact and more readable than XML. And
unlike XML, it is type-aware, so it is not necessary to do string
parsing in application code.
Libconfig is very compact -- just 38K for the stripped C shared
library (less than one-fourth the size of the expat XML parser library)
and 66K for the stripped C++ shared library. This makes it well-suited
for memory-constrained systems like handheld devices.
endef
CONFIGURE_ARGS += \
--enable-shared \
--disable-static \
--disable-cxx
define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/* $(1)/
endef
define Package/libconfig/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libconfig.so.* $(1)/usr/lib/
endef
$(eval $(call BuildPackage,libconfig))

69
package/utils/exfat-utils/Makefile
View File

@ -1,69 +0,0 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=exfat-utils
PKG_VERSION:=1.0.1
PKG_RELEASE:=1
PKG_LICENSE:=GPL-2.0
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/$(PKG_NAME)/$(PKG_NAME)/tar.gz/$(PKG_VERSION)?
PKG_HASH:=7d4e95c3042b58601a581dc02f55eb4a726a2fb8db2e74a9619dbf3083997e06
PKG_FIXUP:=autoreconf
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
include $(INCLUDE_DIR)/package.mk
CONFIGURE_ARGS += \
--enable-shared \
--disable-static
define Package/exfat-utils/Default
SECTION:=utils
CATEGORY:=Utilities
SUBMENU:=Filesystem
DEPENDS:=+libexfat
URL:=https://github.com/exfat-utils/exfat-utils
endef
define Package/exfat-mkfs
$(Package/exfat-utils/Default)
TITLE:=Utility for creating an exFAT File System
endef
define Package/exfat-fsck
$(Package/exfat-utils/Default)
TITLE:=Utility for checking/repairing an exFAT File System
endef
define Package/libexfat
SECTION:=libs
CATEGORY:=Libraries
TITLE:=Library for exFAT File System tools
DEPENDS:=+libuuid
ABI_VERSION:=1
endef
define Package/libexfat/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) \
$(PKG_INSTALL_DIR)/usr/lib/libexfat.so.* $(1)/usr/lib/
endef
define Package/exfat-mkfs/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mkfs.exfat $(1)/usr/sbin
endef
define Package/exfat-fsck/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/fsck.exfat $(1)/usr/sbin
endef
$(eval $(call BuildPackage,libexfat))
$(eval $(call BuildPackage,exfat-mkfs))
$(eval $(call BuildPackage,exfat-fsck))

98
package/utils/xfsprogs/Makefile
View File

@ -1,98 +0,0 @@
#
# Copyright (C) 2006-2012 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=xfsprogs
PKG_CPE_ID:=cpe:/a:sgi:xfsprogs
PKG_RELEASE:=4
PKG_VERSION:=4.11.0
PKG_SOURCE_URL:=@KERNEL/linux/utils/fs/xfs/xfsprogs
PKG_HASH:=c3a6d87b564d7738243c507df82276bed982265e345363a95f2c764e8a5f5bb2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
define Package/xfsprogs/default
SECTION:=utils
CATEGORY:=Utilities
SUBMENU:=Filesystem
DEPENDS:=+libuuid +libpthread +librt
URL:=http://oss.sgi.com/projects/xfs
endef
define Package/xfs-admin
$(call Package/xfsprogs/default)
TITLE:=Utilities for changing parameters of an XFS filesystems
endef
define Package/xfs-mkfs
$(call Package/xfsprogs/default)
TITLE:=Utility for creating XFS filesystems
endef
define Package/xfs-fsck
$(call Package/xfsprogs/default)
TITLE:=Utilities for checking and repairing XFS filesystems
endef
define Package/xfs-growfs
$(call Package/xfsprogs/default)
TITLE:=Utility for increasing the size of XFS filesystems
endef
CONFIGURE_ARGS += \
--enable-gettext=no \
--enable-lib64=no \
--enable-blkid=no
TARGET_CFLAGS += \
-I$(STAGING_DIR)/usr/include \
-D_LARGEFILE64_SOURCE \
-D_FILE_OFFSET_BITS=64 \
-D_GNU_SOURCE
MAKE_FLAGS += \
DEBUG= Q= \
PCFLAGS="-Wall" \
PKG_PLATFORM=linux \
ENABLE_GETTEXT=no
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR)/libxfs crc32table.h CFLAGS="$(HOST_CFLAGS) -I$(PKG_BUILD_DIR)/include"
$(call Build/Compile/Default)
endef
define Package/xfs-admin/install
mkdir -p $(1)/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/xfs_db $(1)/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/xfs_admin $(1)/sbin
endef
define Package/xfs-mkfs/install
mkdir -p $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/mkfs.xfs $(1)/usr/sbin
endef
define Package/xfs-fsck/install
mkdir -p $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/xfs_repair $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/xfs_db $(1)/usr/sbin
endef
define Package/xfs-growfs/install
mkdir -p $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/xfs_growfs $(1)/usr/sbin
endef
$(eval $(call BuildPackage,xfs-admin))
$(eval $(call BuildPackage,xfs-mkfs))
$(eval $(call BuildPackage,xfs-fsck))
$(eval $(call BuildPackage,xfs-growfs))

14
package/utils/xfsprogs/patches/100-no-selftest.patch
View File

@ -1,14 +0,0 @@
--- a/libxfs/Makefile
+++ b/libxfs/Makefile
@@ -118,9 +118,9 @@ LTLIBS = $(LIBPTHREAD) $(LIBRT)
# don't try linking xfs_repair with a debug libxfs.
DEBUG = -DNDEBUG
-LDIRT = gen_crc32table crc32table.h crc32selftest
+LDIRT = gen_crc32table crc32table.h
-default: crc32selftest ltdepend $(LTLIBRARY)
+default: ltdepend $(LTLIBRARY)
crc32table.h: gen_crc32table.c
@echo " [CC] gen_crc32table"

12
package/utils/xfsprogs/patches/110-subdirs.patch
View File

@ -1,12 +0,0 @@
--- a/Makefile
+++ b/Makefile
@@ -46,8 +46,7 @@ HDR_SUBDIRS = include libxfs
DLIB_SUBDIRS = libxlog libxcmd libhandle
LIB_SUBDIRS = libxfs $(DLIB_SUBDIRS)
-TOOL_SUBDIRS = copy db estimate fsck growfs io logprint mkfs quota \
- mdrestore repair rtcp m4 man doc debian
+TOOL_SUBDIRS = db fsck growfs io mkfs repair
ifneq ("$(PKG_PLATFORM)","darwin")
TOOL_SUBDIRS += fsr

12
package/utils/xfsprogs/patches/120-disable_assert.patch
View File

@ -1,12 +0,0 @@
--- a/libxfs/libxfs_priv.h
+++ b/libxfs/libxfs_priv.h
@@ -84,9 +84,6 @@ extern uint32_t crc32c_le(uint32_t crc,
/* for all the support code that uses progname in error messages */
extern char *progname;
-#undef ASSERT
-#define ASSERT(ex) assert(ex)
-
#ifndef EWRONGFS
#define EWRONGFS EINVAL
#endif

26
package/utils/xfsprogs/patches/130-db-malloc-Use-posix_memalign-instead-of-deprecated-v.patch
View File

@ -1,26 +0,0 @@
From 930f9aa8f08759fa739dd6e615ba8b3a1890008d Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 6 May 2019 13:56:13 -0700
Subject: [PATCH] db/malloc: Use posix_memalign instead of deprecated valloc
valloc is not available with uClibc-ng as well as being deprecated, which
causes compilation errors. aligned_alloc is not available before C11 so
used posix_memalign.'
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
db/malloc.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- a/db/malloc.c
+++ b/db/malloc.c
@@ -56,8 +56,7 @@ xmalloc(
{
void *ptr;
- ptr = valloc(size);
- if (ptr)
+ if(!posix_memalign(&ptr, sysconf(_SC_PAGESIZE), size))
return ptr;
badmalloc();
/* NOTREACHED */

48
package/utils/xfsprogs/patches/140-copy-file-range.patch
View File

@ -1,48 +0,0 @@
From 8041435de7ed028a27ecca64302945ad455c69a6 Mon Sep 17 00:00:00 2001
From: "Darrick J. Wong" <darrick.wong@oracle.com>
Date: Mon, 5 Feb 2018 14:38:02 -0600
Subject: [PATCH] xfs_io: fix copy_file_range symbol name collision
glibc 2.27 has a copy_file_range wrapper, so we need to change our
internal function out of the way to avoid compiler warnings.
Reported-by: fredrik@crux.nu
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---
io/copy_file_range.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
--- a/io/copy_file_range.c
+++ b/io/copy_file_range.c
@@ -42,13 +42,18 @@ copy_range_help(void)
"));
}
+/*
+ * Issue a raw copy_file_range syscall; for our test program we don't want the
+ * glibc buffered copy fallback.
+ */
static loff_t
-copy_file_range(int fd, loff_t *src, loff_t *dst, size_t len)
+copy_file_range_cmd(int fd, loff_t *src, loff_t *dst, size_t len)
{
loff_t ret;
do {
- ret = syscall(__NR_copy_file_range, fd, src, file->fd, dst, len, 0);
+ ret = syscall(__NR_copy_file_range, fd, src, file->fd, dst,
+ len, 0);
if (ret == -1) {
perror("copy_range");
return errno;
@@ -130,7 +135,7 @@ copy_range_f(int argc, char **argv)
copy_dst_truncate();
}
- ret = copy_file_range(fd, &src, &dst, len);
+ ret = copy_file_range_cmd(fd, &src, &dst, len);
close(fd);
return ret;
}

2
target/linux/bcm27xx/Makefile
View File

@ -28,7 +28,7 @@ DEFAULT_PACKAGES += \
kmod-sound-core kmod-sound-arm-bcm2835 \
kmod-fs-vfat kmod-nls-cp437 kmod-nls-iso8859-1 \
partx-utils mkf2fs e2fsprogs \
htop autocore-raspberrypi
htop autocore-arm
KERNELNAME:=Image dtbs

2
target/linux/generic/pending-4.14/760-net-usb-aqc111-Driver-skeleton-for-Aquantia-AQtionUSB-to-5GbE.patch
View File

@ -1856,7 +1856,7 @@
static const struct usb_device_id products[] = {
/* BLACKLIST !!
@@ -835,6 +837,30 @@ static const struct usb_device_id produc
@@ -842,6 +844,30 @@ static const struct usb_device_id produc
.driver_info = 0,
},

10
target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
View File

@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
__u16 tc_index; /* traffic control index */
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5467,6 +5467,9 @@ static enum gro_result dev_gro_receive(s
@@ -5477,6 +5477,9 @@ static enum gro_result dev_gro_receive(s
int same_flow;
int grow;
@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (netif_elide_gro(skb->dev))
goto normal;
@@ -7125,6 +7128,48 @@ static void __netdev_adjacent_dev_unlink
@@ -7135,6 +7138,48 @@ static void __netdev_adjacent_dev_unlink
&upper_dev->adj_list.lower);
}
@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static int __netdev_upper_dev_link(struct net_device *dev,
struct net_device *upper_dev, bool master,
void *upper_priv, void *upper_info,
@@ -7175,6 +7220,7 @@ static int __netdev_upper_dev_link(struc
@@ -7185,6 +7230,7 @@ static int __netdev_upper_dev_link(struc
if (ret)
return ret;
@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info);
ret = notifier_to_errno(ret);
@@ -7267,6 +7313,7 @@ void netdev_upper_dev_unlink(struct net_
@@ -7277,6 +7323,7 @@ void netdev_upper_dev_unlink(struct net_
__netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);
@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
&changeupper_info.info);
@@ -7906,6 +7953,7 @@ int dev_set_mac_address(struct net_devic
@@ -7916,6 +7963,7 @@ int dev_set_mac_address(struct net_devic
if (err)
return err;
dev->addr_assign_type = NET_ADDR_SET;

2
target/linux/generic/pending-4.19/760-net-usb-aqc111-Driver-skeleton-for-Aquantia-AQtionUSB-to-5GbE.patch
View File

@ -1856,7 +1856,7 @@
static const struct usb_device_id products[] = {
/* BLACKLIST !!
@@ -835,6 +837,30 @@ static const struct usb_device_id produc
@@ -842,6 +844,30 @@ static const struct usb_device_id produc
.driver_info = 0,
},

2
target/linux/ipq806x/Makefile
View File

@ -24,7 +24,7 @@ DEFAULT_PACKAGES += \
kmod-ata-core kmod-ata-ahci kmod-ata-ahci-platform \
kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \
kmod-usb3 kmod-usb-dwc3-of-simple kmod-usb-phy-qcom-dwc3 kmod-usb-dwc3-qcom \
kmod-ath10k-ct wpad uboot-envtools e2fsprogs \
kmod-ath10k-ct wpad uboot-envtools e2fsprogs autocore-arm \
automount autosamba v2ray shadowsocks-libev-ss-redir shadowsocksr-libev-server \
luci-app-ipsec-vpnd luci-app-unblockmusic luci-app-zerotier ca-certificates