scottk/wlan-ap
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-11-01 10:57:47 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

ipq807x: do no keep uboot-env config during sysupgrade

Browse Source 
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2022-12-08 15:31:30 +01:00
parent 71189b1b74
commit db617e23f0
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
patches/ipq807x/0004-ipq807x-add-the-Qualcomm-AX-target-support.patch
View File

@@ -1,16 +1,16 @@
From 1749748819caa03e249e8a5df1311498550cbd3b Mon Sep 17 00:00:00 2001 From c931a11e400ddf501f6796c62ba512195a1561ce Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org> From: John Crispin <john@phrozen.org>
Date: Sat, 18 Jul 2020 08:53:44 +0200 Date: Sat, 18 Jul 2020 08:53:44 +0200
Subject: [PATCH 68/83] ipq807x: add the Qualcomm AX target support Subject: [PATCH] ipq807x: add the Qualcomm AX target support
Signed-off-by: John Crispin <john@phrozen.org> Signed-off-by: John Crispin <john@phrozen.org>
--- ---
config/Config-kernel.in | 9 ++++++ config/Config-kernel.in | 9 ++++++
include/image.mk | 6 +++- include/image.mk | 6 +++-
include/kernel-version.mk | 2 +- include/kernel-version.mk | 2 +-
package/boot/uboot-envtools/Makefile | 5 ---
package/boot/uboot-envtools/files/ipq807x | 37 +++++++++++++++++++++++ package/boot/uboot-envtools/files/ipq807x | 37 +++++++++++++++++++++++
toolchain/kernel-headers/Makefile | 8 +++++ 5 files changed, 52 insertions(+), 7 deletions(-)
5 files changed, 60 insertions(+), 2 deletions(-)
create mode 100644 package/boot/uboot-envtools/files/ipq807x create mode 100644 package/boot/uboot-envtools/files/ipq807x
diff --git a/config/Config-kernel.in b/config/Config-kernel.in diff --git a/config/Config-kernel.in b/config/Config-kernel.in
@@ -70,13 +70,29 @@ index c7aba61cd7..efecf2f919 100644
LINUX_KERNEL_HASH-4.14.193 = 0b0fb41d4430e1a42738b341cbfd2f41951aa5cd02acabbd53f076119c8b9f03 LINUX_KERNEL_HASH-4.14.193 = 0b0fb41d4430e1a42738b341cbfd2f41951aa5cd02acabbd53f076119c8b9f03
LINUX_KERNEL_HASH-5.4.158 = 6e018fecdc8fc24553756e582d83b82d65b10a6b03ef36262a24911f839b8d59 LINUX_KERNEL_HASH-5.4.158 = 6e018fecdc8fc24553756e582d83b82d65b10a6b03ef36262a24911f839b8d59
LINUX_KERNEL_HASH-5.10.27 = d99dc9662951299c53a0a8d8c8d0a72a16ff861d20e927c0f9b14f63282d69d9 LINUX_KERNEL_HASH-5.10.27 = d99dc9662951299c53a0a8d8c8d0a72a16ff861d20e927c0f9b14f63282d69d9
diff --git a/package/boot/uboot-envtools/Makefile b/package/boot/uboot-envtools/Makefile
index a9eccec0ce..0696c81bea 100644
--- a/package/boot/uboot-envtools/Makefile
+++ b/package/boot/uboot-envtools/Makefile
@@ -58,11 +58,6 @@ MAKE_FLAGS += \
no-dot-config-targets=envtools \
envtools
-define Package/uboot-envtools/conffiles
-/etc/config/ubootenv
-/etc/fw_env.config
-endef
-
define Package/uboot-envtools/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/env/fw_printenv $(1)/usr/sbin
diff --git a/package/boot/uboot-envtools/files/ipq807x b/package/boot/uboot-envtools/files/ipq807x diff --git a/package/boot/uboot-envtools/files/ipq807x b/package/boot/uboot-envtools/files/ipq807x
new file mode 100644 new file mode 100644
index 0000000000..6c429f1852 index 0000000000..84ed73f288
--- /dev/null --- /dev/null
+++ b/package/boot/uboot-envtools/files/ipq807x +++ b/package/boot/uboot-envtools/files/ipq807x
@@ -0,0 +1,37 @@ @@ -0,0 +1,37 @@
+[ -e /etc/config/ubootenv ] && exit 0 +[ -e /etc/config/ubootenv ] && rm /etc/config/ubootenv
+ +
+touch /etc/config/ubootenv +touch /etc/config/ubootenv
+ +