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

Merge Mainline

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@gmail.com>
This commit is contained in:
Tianling Shen 2021-02-02 01:04:57 +08:00
commit c9db1325f9
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
9 changed files with 41 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/ctcgfw/luci-app-adguardhome/Makefile
View File

@ -12,7 +12,7 @@ PKG_MAINTAINER:=<https://github.com/rufengsuixing/luci-app-adguardhome>
LUCI_TITLE:=LuCI app for AdGuardHome
LUCI_PKGARCH:=all
LUCI_DEPENDS:=+ca-certs +curl +wget-ssl +PACKAGE_$(PKG_NAME)_INCLUDE_binary:AdGuardHome
LUCI_DEPENDS:=+ca-certs +curl +wget-ssl +PACKAGE_$(PKG_NAME)_INCLUDE_binary:adguardhome
LUCI_DESCRIPTION:=LuCI support for AdGuardHome
define Package/$(PKG_NAME)/config

2
package/ctcgfw/luci-app-adguardhome/root/etc/config/AdGuardHome
View File

@ -2,7 +2,7 @@ config AdGuardHome 'AdGuardHome'
option enabled '0'
option httpport '3000'
option redirect 'none'
option configpath '/etc/AdGuardHome/AdGuardHome.yaml'
option configpath '/etc/AdGuardHome.yaml'
option workdir '/etc/AdGuardHome'
option logfile '/tmp/AdGuardHome.log'
option verbose '0'

19
package/ctcgfw/mt7601u-ap/patches/010-fix-control-reaches-end-of-non-void.patch Normal file
View File

@ -0,0 +1,19 @@
--- a/mcu/rtmp_mcu.c
+++ b/mcu/rtmp_mcu.c
@@ -31,6 +31,7 @@
INT MCUBurstWrite(PRTMP_ADAPTER pAd, UINT32 Offset, UINT32 *Data, UINT32 Cnt)
{
RTUSBMultiWrite_nBytes(pAd, Offset, Data, Cnt * 4, 64);
+ return 0;
}
INT MCURandomWrite(PRTMP_ADAPTER pAd, RTMP_REG_PAIR *RegPair, UINT32 Num)
@@ -39,6 +40,8 @@ INT MCURandomWrite(PRTMP_ADAPTER pAd, RTMP_REG_PAIR *RegPair, UINT32 Num)
for (Index = 0; Index < Num; Index++)
RTMP_IO_WRITE32(pAd, RegPair->Register, RegPair->Value);
+
+ return 0;
}
VOID ChipOpsMCUHook(PRTMP_ADAPTER pAd, enum MCU_TYPE MCUType)

6
package/ctcgfw/rtl8812au-ac/Makefile
View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2020 Marty Jones <mj8263788@gmail.com>
# Copyright (C) 2020 stepheny
#
# Copyright (C) 2021 CTCGFW Project-OpenWrt
# <https://project-openwrt.eu.org>
@ -19,8 +19,9 @@ PKG_SOURCE_DATE:=2020-06-26
PKG_SOURCE_VERSION:=58f6be25f7c86d7ba67b0ccc638cf667755e6e1b
PKG_MIRROR_HASH:=60359df8b49fa433d38b968b0df7eaddaca10f13cdd57471394bac1f6e5a162e
PKG_LICENSE:=GPLv2
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=LICENSE
PKG_MAINTAINER:=Marty Jones <mj8263788@gmail.com>
PKG_BUILD_PARALLEL:=1
@ -58,7 +59,6 @@ NOSTDINC_FLAGS += -DCONFIG_LITTLE_ENDIAN
endif
PKG_MAKE_FLAGS += USER_MODULE_NAME=rtl8812au
PKG_MAKE_FLAGS += USER_DRV_NAME=rtl8812au
KERNEL_MAKE_FLAGS += CONFIG_88XXAU=m
define Build/Compile

3
package/ctcgfw/rtl8821cu/Makefile
View File

@ -17,8 +17,9 @@ PKG_SOURCE_DATE:=2020-07-27
PKG_SOURCE_VERSION:=93b04bfcd293fdd7d98d5a7c964ae9416a40159c
PKG_MIRROR_HASH:=e3d798355625bd71596ce08741e1f7f3523951e91be775edf2a936ab260bd5de
PKG_LICENSE:=GPLv2
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=LICENSE
PKG_MAINTAINTER:=CN_SZTL <cnsztl@project-openwrt.eu.org>
PKG_BUILD_PARALLEL:=1

3
package/ctcgfw/rtl88x2bu/Makefile
View File

@ -17,8 +17,9 @@ PKG_SOURCE_DATE:=2020-07-21
PKG_SOURCE_VERSION:=a2abcaf523dfab2afeda8cc2cdb5e3c9510fc5f3
PKG_MIRROR_HASH:=26d5504c9323c9c133265f2c2e4213acca0ddf390b1b4399d1003e9fd45f9368
PKG_LICENSE:=GPLv2
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=LICENSE
PKG_MAINTAINTER:=ElonH <elonh@project-openwrt.eu.org>
PKG_BUILD_PARALLEL:=1

4
package/system/selinux-policy/Makefile
View File

@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=selinux-policy
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://git.defensec.nl/selinux-policy.git
PKG_VERSION:=0.4
PKG_MIRROR_HASH:=6bf4df7df2e1a4f641e4068ec79b1f4921e29e531d5b76843f39c79470e646f8
PKG_VERSION:=0.5
PKG_MIRROR_HASH:=c96a8cf7ac3445c52a28150c5000a55bde8112402bc77ccfee825cff0bdc8a03
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
PKG_BUILD_DEPENDS:=secilc/host policycoreutils/host

12
package/utils/util-linux/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=util-linux
PKG_VERSION:=2.36.1
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.36
@ -534,10 +534,20 @@ TARGET_CFLAGS += $(FPIC) -std=gnu99
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/blkid.pc $(1)/usr/lib/pkgconfig
$(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/blkid.pc
$(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/blkid.pc
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fdisk.pc $(1)/usr/lib/pkgconfig
$(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/fdisk.pc
$(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/fdisk.pc
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/mount.pc $(1)/usr/lib/pkgconfig
$(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/mount.pc
$(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/mount.pc
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/smartcols.pc $(1)/usr/lib/pkgconfig
$(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/smartcols.pc
$(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/smartcols.pc
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/uuid.pc $(1)/usr/lib/pkgconfig
$(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/uuid.pc
$(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/uuid.pc
$(INSTALL_DIR) $(1)/usr/include/blkid
$(CP) $(PKG_INSTALL_DIR)/usr/include/blkid/blkid.h $(1)/usr/include/blkid

76
package/utils/util-linux/patches/003-fix_pkgconfig_files.patch
View File

@ -1,76 +0,0 @@
--- a/libuuid/Makemodule.am
+++ b/libuuid/Makemodule.am
@@ -4,7 +4,6 @@ include libuuid/man/Makemodule.am
include libuuid/src/Makemodule.am
pkgconfig_DATA += libuuid/uuid.pc
-PATHFILES += libuuid/uuid.pc
EXTRA_DIST += libuuid/COPYING
endif # BUILD_LIBUUID
--- a/configure.ac
+++ b/configure.ac
@@ -2522,18 +2522,23 @@ AC_CONFIG_HEADERS([config.h])
#
AC_CONFIG_FILES([
Makefile
+libblkid/blkid.pc
libblkid/docs/Makefile
libblkid/docs/version.xml
libblkid/src/blkid.h
+libfdisk/fdisk.pc
libfdisk/docs/Makefile
libfdisk/docs/version.xml
libfdisk/src/libfdisk.h
+libmount/mount.pc
libmount/docs/Makefile
libmount/docs/version.xml
libmount/src/libmount.h
+libsmartcols/smartcols.pc
libsmartcols/docs/Makefile
libsmartcols/docs/version.xml
libsmartcols/src/libsmartcols.h
+libuuid/uuid.pc
po/Makefile.in
])
--- a/libblkid/Makemodule.am
+++ b/libblkid/Makemodule.am
@@ -9,7 +9,6 @@ SUBDIRS += libblkid/docs
endif
pkgconfig_DATA += libblkid/blkid.pc
-PATHFILES += libblkid/blkid.pc
dist_man_MANS += libblkid/libblkid.3
EXTRA_DIST += libblkid/COPYING
--- a/libmount/Makemodule.am
+++ b/libmount/Makemodule.am
@@ -9,7 +9,6 @@ SUBDIRS += libmount/docs
endif
pkgconfig_DATA += libmount/mount.pc
-PATHFILES += libmount/mount.pc
EXTRA_DIST += libmount/COPYING
endif # BUILD_LIBMOUNT
--- a/libsmartcols/Makemodule.am
+++ b/libsmartcols/Makemodule.am
@@ -9,7 +9,6 @@ SUBDIRS += libsmartcols/docs
endif
pkgconfig_DATA += libsmartcols/smartcols.pc
-PATHFILES += libsmartcols/smartcols.pc
EXTRA_DIST += libsmartcols/COPYING
endif # BUILD_LIBSMARTCOLS
--- a/libfdisk/Makemodule.am
+++ b/libfdisk/Makemodule.am
@@ -9,7 +9,6 @@ SUBDIRS += libfdisk/docs
endif
pkgconfig_DATA += libfdisk/fdisk.pc
-PATHFILES += libfdisk/fdisk.pc
EXTRA_DIST += libfdisk/COPYING
endif # BUILD_LIBFDISK