mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

sync (#562)

Browse source
This commit is contained in:
suyuan 2024-11-01 20:29:07 +08:00 • committed by GitHub
commit 5dd7e6e2c9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 65 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

20
bcm27xx-eeprom/Makefile
View file

@ -5,9 +5,9 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/raspberrypi/rpi-eeprom PKG_SOURCE_URL:=https://github.com/raspberrypi/rpi-eeprom
PKG_SOURCE_DATE:=2024-06-05 PKG_SOURCE_DATE:=2024-09-23
PKG_SOURCE_VERSION:=e430a41e7323a1e28fb42b53cf79e5ba9b5ee975 PKG_SOURCE_VERSION:=c8fffcda5ae0f923857a73fedbeb07e81d2eb813
PKG_MIRROR_HASH:=6c9a45d4ea0f33a9dc18f11b6cdeb425f0682dc41099df3a1f350939aecce353 PKG_MIRROR_HASH:=68d0eedd1aff573c2ea7071f89a5898292061ced96d7f98ea4a347dc16c8102c
PKG_LICENSE:=BSD-3-Clause Custom PKG_LICENSE:=BSD-3-Clause Custom
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
@ -74,21 +74,21 @@ endef
define Package/bcm2711-eeprom/install define Package/bcm2711-eeprom/install
$(INSTALL_DIR) $(1)/lib/firmware/raspberrypi/bootloader-2711 $(INSTALL_DIR) $(1)/lib/firmware/raspberrypi/bootloader-2711
$(INSTALL_DIR) $(1)/lib/firmware/raspberrypi/bootloader-2711/default $(INSTALL_DIR) $(1)/lib/firmware/raspberrypi/bootloader-2711/latest
$(CP) $(PKG_BUILD_DIR)/firmware-2711/release-notes.md $(1)/lib/firmware/raspberrypi/bootloader-2711 $(CP) $(PKG_BUILD_DIR)/firmware-2711/release-notes.md $(1)/lib/firmware/raspberrypi/bootloader-2711
$(CP) $(PKG_BUILD_DIR)/firmware-2711/default/pieeprom-2024-04-15.bin $(1)/lib/firmware/raspberrypi/bootloader-2711/default $(CP) $(PKG_BUILD_DIR)/firmware-2711/latest/pieeprom-2024-09-05.bin $(1)/lib/firmware/raspberrypi/bootloader-2711/latest
$(CP) $(PKG_BUILD_DIR)/firmware-2711/default/recovery.bin $(1)/lib/firmware/raspberrypi/bootloader-2711/default $(CP) $(PKG_BUILD_DIR)/firmware-2711/latest/recovery.bin $(1)/lib/firmware/raspberrypi/bootloader-2711/latest
$(CP) $(PKG_BUILD_DIR)/firmware-2711/default/vl805-000138c0.bin $(1)/lib/firmware/raspberrypi/bootloader-2711/default $(CP) $(PKG_BUILD_DIR)/firmware-2711/latest/vl805-000138c0.bin $(1)/lib/firmware/raspberrypi/bootloader-2711/latest
endef endef
define Package/bcm2712-eeprom/install define Package/bcm2712-eeprom/install
$(INSTALL_DIR) $(1)/lib/firmware/raspberrypi/bootloader-2712 $(INSTALL_DIR) $(1)/lib/firmware/raspberrypi/bootloader-2712
$(INSTALL_DIR) $(1)/lib/firmware/raspberrypi/bootloader-2712/default $(INSTALL_DIR) $(1)/lib/firmware/raspberrypi/bootloader-2712/latest
$(CP) $(PKG_BUILD_DIR)/firmware-2712/release-notes.md $(1)/lib/firmware/raspberrypi/bootloader-2712 $(CP) $(PKG_BUILD_DIR)/firmware-2712/release-notes.md $(1)/lib/firmware/raspberrypi/bootloader-2712
$(CP) $(PKG_BUILD_DIR)/firmware-2712/default/pieeprom-2024-04-20.bin $(1)/lib/firmware/raspberrypi/bootloader-2712/default $(CP) $(PKG_BUILD_DIR)/firmware-2712/latest/pieeprom-2024-09-23.bin $(1)/lib/firmware/raspberrypi/bootloader-2712/latest
$(CP) $(PKG_BUILD_DIR)/firmware-2712/default/recovery.bin $(1)/lib/firmware/raspberrypi/bootloader-2712/default $(CP) $(PKG_BUILD_DIR)/firmware-2712/latest/recovery.bin $(1)/lib/firmware/raspberrypi/bootloader-2712/latest
endef endef
$(eval $(call BuildPackage,bcm27xx-eeprom)) $(eval $(call BuildPackage,bcm27xx-eeprom))

3
bcm27xx-eeprom/patches/0001-rpi-eeprom-update-OpenWrt-defaults.patch
View file

@ -28,8 +28,9 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
FIRMWARE_ROOT=/lib/firmware/raspberrypi/bootloader FIRMWARE_ROOT=/lib/firmware/raspberrypi/bootloader
FIRMWARE_RELEASE_STATUS="default" -FIRMWARE_RELEASE_STATUS="default"
-FIRMWARE_BACKUP_DIR="/var/lib/raspberrypi/bootloader/backup" -FIRMWARE_BACKUP_DIR="/var/lib/raspberrypi/bootloader/backup"
+FIRMWARE_RELEASE_STATUS="latest"
+FIRMWARE_BACKUP_DIR="${FIRMWARE_ROOT}/backup" +FIRMWARE_BACKUP_DIR="${FIRMWARE_ROOT}/backup"
EEPROM_CONFIG_HOOK= EEPROM_CONFIG_HOOK=

8
bcm27xx-eeprom/patches/0002-rpi-eeprom-update-change-default-include-path.patch
View file

@ -24,7 +24,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
fi fi
LOCAL_MODE=0 LOCAL_MODE=0
@@ -423,7 +423,7 @@ checkDependencies() { @@ -439,7 +439,7 @@ checkDependencies() {
echo "Run with -h for more information." echo "Run with -h for more information."
echo echo
echo "To enable flashrom programming of the EEPROM" echo "To enable flashrom programming of the EEPROM"
@ -33,7 +33,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
echo "RPI_EEPROM_USE_FLASHROM=1" echo "RPI_EEPROM_USE_FLASHROM=1"
echo "CM4_ENABLE_RPI_EEPROM_UPDATE=1" echo "CM4_ENABLE_RPI_EEPROM_UPDATE=1"
echo echo
@@ -514,7 +514,7 @@ The system should then boot normally. @@ -526,7 +526,7 @@ The system should then boot normally.
If /boot does not correspond to the boot partition and this If /boot does not correspond to the boot partition and this
is not a NOOBS system, then the mount point for BOOTFS should be defined is not a NOOBS system, then the mount point for BOOTFS should be defined
@ -42,7 +42,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
A backup of the current EEPROM config file is written to ${FIRMWARE_BACKUP_DIR} A backup of the current EEPROM config file is written to ${FIRMWARE_BACKUP_DIR}
before applying the update. before applying the update.
@@ -546,7 +546,7 @@ Options: @@ -558,7 +558,7 @@ Options:
-u Install the specified VL805 (USB EEPROM) image file. -u Install the specified VL805 (USB EEPROM) image file.
Environment: Environment:
@ -51,7 +51,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
EEPROM_CONFIG_HOOK EEPROM_CONFIG_HOOK
@@ -618,7 +618,7 @@ must first be enabled by removing ENABLE @@ -630,7 +630,7 @@ must first be enabled by removing ENABLE
via usbboot. via usbboot.
After enabling self-update set the CM4_ENABLE_RPI_EEPROM_UPDATE=1 environment After enabling self-update set the CM4_ENABLE_RPI_EEPROM_UPDATE=1 environment

4
bcm27xx-eeprom/patches/0003-rpi-eeprom-update-chmod-silent-f-is-not-supported.patch
View file

@ -13,7 +13,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
--- a/rpi-eeprom-update --- a/rpi-eeprom-update
+++ b/rpi-eeprom-update +++ b/rpi-eeprom-update
@@ -216,7 +216,7 @@ applyRecoveryUpdate() @@ -220,7 +220,7 @@ applyRecoveryUpdate()
|| die "Failed to copy ${TMP_EEPROM_IMAGE} to ${BOOTFS}" || die "Failed to copy ${TMP_EEPROM_IMAGE} to ${BOOTFS}"
# For NFS mounts ensure that the files are readable to the TFTP user # For NFS mounts ensure that the files are readable to the TFTP user
@ -22,7 +22,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
|| die "Failed to set permissions on eeprom update files" || die "Failed to set permissions on eeprom update files"
fi fi
@@ -227,7 +227,7 @@ applyRecoveryUpdate() @@ -231,7 +231,7 @@ applyRecoveryUpdate()
|| die "Failed to copy ${VL805_UPDATE_IMAGE} to ${BOOTFS}/vl805.bin" || die "Failed to copy ${VL805_UPDATE_IMAGE} to ${BOOTFS}/vl805.bin"
# For NFS mounts ensure that the files are readable to the TFTP user # For NFS mounts ensure that the files are readable to the TFTP user

4
bcm27xx-eeprom/patches/0004-rpi-eeprom-config-replace-nano-with-vi-as-default-ed.patch
View file

@ -13,7 +13,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
--- a/rpi-eeprom-config --- a/rpi-eeprom-config
+++ b/rpi-eeprom-config +++ b/rpi-eeprom-config
@@ -184,8 +184,8 @@ def edit_config(eeprom=None): @@ -186,8 +186,8 @@ def edit_config(eeprom=None):
""" """
Implements something like 'git commit' for editing EEPROM configs. Implements something like 'git commit' for editing EEPROM configs.
""" """
@ -24,7 +24,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
if 'EDITOR' in os.environ: if 'EDITOR' in os.environ:
editor = os.environ['EDITOR'] editor = os.environ['EDITOR']
@@ -484,7 +484,7 @@ Operating modes: @@ -517,7 +517,7 @@ Operating modes:
To cancel the pending update run 'sudo rpi-eeprom-update -r' To cancel the pending update run 'sudo rpi-eeprom-update -r'

41
modemmanager/files/usr/libexec/rpcd/modemmanager Normal file → Executable file
View file

@ -143,6 +143,19 @@ function mm_get_modem_status(modem)
table.insert(status["modem"], mstatus["modem"]) table.insert(status["modem"], mstatus["modem"])
end end
function mm_get_modem_gps(modem)
location = {}
mstatus = {}
mm_get_modem_location(modem)
if (next(location) ~= nil) then
mstatus["location"] = location
else
mstatus["location"] = {}
end
table.insert(gps["modem"], mstatus["location"])
end
function aquire_data_modemmanager() function aquire_data_modemmanager()
local command = string.format("/usr/bin/mmcli --list-modems --output-json 2>/dev/null") local command = string.format("/usr/bin/mmcli --list-modems --output-json 2>/dev/null")
@ -167,6 +180,30 @@ function aquire_data_modemmanager()
end end
end end
function aquire_data_gps()
local command = string.format("/usr/bin/mmcli --list-modems --output-json 2>/dev/null")
local handle = io.popen(command)
local output = handle:read("*a")
handle:close()
local ok, modems = pcall(function()
return json.decode(output)
end)
if not ok then
return
end
entry_cache = {}
gps = {}
gps["modem"] = {}
for k, v in ipairs(modems["modem-list"]) do
mm_get_modem_gps(modems["modem-list"][k])
end
end
function aquire_data_info() function aquire_data_info()
aquire_data_modemmanager() aquire_data_modemmanager()
@ -200,6 +237,7 @@ function main(cmd, call)
if cmd == "list" then if cmd == "list" then
print(json.encode({ print(json.encode({
dump = {}, dump = {},
gps = {},
info = {} info = {}
})) }))
elseif cmd == "call" then elseif cmd == "call" then
@ -209,6 +247,9 @@ function main(cmd, call)
elseif call == "info" then elseif call == "info" then
aquire_data_info() aquire_data_info()
print(json.encode(info)) print(json.encode(info))
elseif call == "gps" then
aquire_data_gps()
print(json.encode(gps))
end end
end end
end end

6
xray-core/Makefile
View file

@ -8,7 +8,8 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=xray PKG_NAME:=xray
PKG_VERSION:=1.8.24 #PKG_VERSION:=1.8.24
PKG_VERSION:=24.9.30
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_LICENSE:=MPLv2 PKG_LICENSE:=MPLv2
@ -16,7 +17,8 @@ PKG_LICENSE_FILES:=LICENSE
PKG_MAINTAINER:=Yannick Chabanois <contact@openmptcprouter.com> PKG_MAINTAINER:=Yannick Chabanois <contact@openmptcprouter.com>
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/XTLS/Xray-core.git PKG_SOURCE_URL:=https://github.com/XTLS/Xray-core.git
PKG_SOURCE_VERSION:=6baad79f9881ee2cf75bdc825b3e2e92b289477a PKG_SOURCE_VERSION:=e733148c0bf78f6298cf08045297e783568b80c9
#PKG_SOURCE_VERSION:=6baad79f9881ee2cf75bdc825b3e2e92b289477a
PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_DEPENDS:=golang/host
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1