diff --git a/general/package/all-patches/linux/01_change_uimage_header.patch b/general/package/all-patches/linux/0001-change_uimage_header.patch
old mode 100755
new mode 100644
similarity index 100%
rename from general/package/all-patches/linux/01_change_uimage_header.patch
rename to general/package/all-patches/linux/0001-change_uimage_header.patch
diff --git a/general/package/anyka-osdrv-ak3918ev200/anyka-osdrv-ak3918ev200.mk b/general/package/anyka-osdrv-ak3918ev200/anyka-osdrv-ak3918ev200.mk
index 333022ce..125c624f 100644
--- a/general/package/anyka-osdrv-ak3918ev200/anyka-osdrv-ak3918ev200.mk
+++ b/general/package/anyka-osdrv-ak3918ev200/anyka-osdrv-ak3918ev200.mk
@@ -9,7 +9,6 @@ ANYKA_OSDRV_AK3918EV200_SITE =
 ANYKA_OSDRV_AK3918EV200_LICENSE = MIT
 ANYKA_OSDRV_AK3918EV200_LICENSE_FILES = LICENSE
 
-
 define ANYKA_OSDRV_AK3918EV200_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_ANYKA_PATH)/package/anyka-osdrv-ak3918ev200/files/script/S95anyka
@@ -17,7 +16,7 @@ define ANYKA_OSDRV_AK3918EV200_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors $(BR2_EXTERNAL_ANYKA_PATH)/package/anyka-osdrv-ak3918ev200/files/sensor/config/*.conf
 
-	$(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/3.4.35/anyka	
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/3.4.35/anyka
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/3.4.35/anyka $(BR2_EXTERNAL_ANYKA_PATH)/package/anyka-osdrv-ak3918ev200/files/kmod/*.ko
 
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
diff --git a/general/package/anyka_patcher/anyka_patcher.mk b/general/package/anyka_patcher/anyka_patcher.mk
index 30f5e1e9..6e279948 100644
--- a/general/package/anyka_patcher/anyka_patcher.mk
+++ b/general/package/anyka_patcher/anyka_patcher.mk
@@ -6,7 +6,6 @@
 
 ANYKA_PATCHER_VERSION = 0.1
 ANYKA_PATCHER_INSTALL_TARGET = NO
-ANYKA_PATCHER_INSTALL_STAGING = NO
 ANYKA_PATCHER_SITE =
 ANYKA_PATCHER_SOURCE =
 
diff --git a/general/package/aura-httpd/Config.in b/general/package/aura-httpd/Config.in
index e23d0122..928a092b 100644
--- a/general/package/aura-httpd/Config.in
+++ b/general/package/aura-httpd/Config.in
@@ -1,8 +1,9 @@
 config BR2_PACKAGE_AURA_HTTPD
 	bool "aura-httpd"
 	help
-	  aura-httpd provides a simple way to bring aura to the world of the WEB automatically
-	  creating a fun, easy to use REST API out of the methods you've exported from an aura node.
-	  It's still WIP and not yet usable
+	  aura-httpd provides a simple way to bring aura to the world of
+	  the WEB automatically creating a fun, easy to use REST API out
+	  of the methods you've exported from an aura node.
+	  It's still WIP and not yet usable.
 
 	  https://github.com/nekromant/aura-httpd
diff --git a/general/package/fdk-aac-openipc/fdk-aac-openipc.mk b/general/package/fdk-aac-openipc/fdk-aac-openipc.mk
index ffed8102..199dbdda 100644
--- a/general/package/fdk-aac-openipc/fdk-aac-openipc.mk
+++ b/general/package/fdk-aac-openipc/fdk-aac-openipc.mk
@@ -20,5 +20,4 @@ define FDK_AAC_OPENIPC_RUN_AUTOGEN
 endef
 FDK_AAC_OPENIPC_PRE_CONFIGURE_HOOKS += FDK_AAC_OPENIPC_RUN_AUTOGEN
 
-
 $(eval $(autotools-package))
diff --git a/general/package/fullhan-osdrv-fh8852v100/fullhan-osdrv-fh8852v100.mk b/general/package/fullhan-osdrv-fh8852v100/fullhan-osdrv-fh8852v100.mk
index d6ef3a00..e5fe2654 100644
--- a/general/package/fullhan-osdrv-fh8852v100/fullhan-osdrv-fh8852v100.mk
+++ b/general/package/fullhan-osdrv-fh8852v100/fullhan-osdrv-fh8852v100.mk
@@ -9,7 +9,6 @@ FULLHAN_OSDRV_FH8852V100_SITE =
 FULLHAN_OSDRV_FH8852V100_LICENSE = MIT
 FULLHAN_OSDRV_FH8852V100_LICENSE_FILES = LICENSE
 
-
 define FULLHAN_OSDRV_FH8852V100_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_FULLHAN_PATH)/package/fullhan-osdrv-fh8852v100/files/script/S95fullhan
@@ -31,8 +30,6 @@ define FULLHAN_OSDRV_FH8852V100_INSTALL_TARGET_CMDS
 
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib/sensors/params
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors/params $(BR2_EXTERNAL_FULLHAN_PATH)/package/fullhan-osdrv-fh8852v100/files/sensor/params/*
-
-
 endef
 
 $(eval $(generic-package))
diff --git a/general/package/fullhan-osdrv-fh8852v200/fullhan-osdrv-fh8852v200.mk b/general/package/fullhan-osdrv-fh8852v200/fullhan-osdrv-fh8852v200.mk
index ad91bfdc..f41ee1fa 100644
--- a/general/package/fullhan-osdrv-fh8852v200/fullhan-osdrv-fh8852v200.mk
+++ b/general/package/fullhan-osdrv-fh8852v200/fullhan-osdrv-fh8852v200.mk
@@ -9,7 +9,6 @@ FULLHAN_OSDRV_FH8852V200_SITE =
 FULLHAN_OSDRV_FH8852V200_LICENSE = MIT
 FULLHAN_OSDRV_FH8852V200_LICENSE_FILES = LICENSE
 
-
 define FULLHAN_OSDRV_FH8852V200_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_FULLHAN_PATH)/package/fullhan-osdrv-fh8852v200/files/script/S95fullhan
@@ -31,8 +30,6 @@ define FULLHAN_OSDRV_FH8852V200_INSTALL_TARGET_CMDS
 
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib/sensors/params
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/sensors/params $(BR2_EXTERNAL_FULLHAN_PATH)/package/fullhan-osdrv-fh8852v200/files/sensor/params/*
-
-
 endef
 
 $(eval $(generic-package))
diff --git a/general/package/fullhan_patcher/fullhan_patcher.mk b/general/package/fullhan_patcher/fullhan_patcher.mk
index 6d14e77e..62f860b4 100644
--- a/general/package/fullhan_patcher/fullhan_patcher.mk
+++ b/general/package/fullhan_patcher/fullhan_patcher.mk
@@ -6,7 +6,6 @@
 
 FULLHAN_PATCHER_VERSION = 0.1
 FULLHAN_PATCHER_INSTALL_TARGET = NO
-FULLHAN_PATCHER_INSTALL_STAGING = NO
 FULLHAN_PATCHER_SITE =
 FULLHAN_PATCHER_SOURCE =
 
diff --git a/general/package/goke-osdrv-gk7205v200/goke-osdrv-gk7205v200.mk b/general/package/goke-osdrv-gk7205v200/goke-osdrv-gk7205v200.mk
index 7446d5a3..e162be28 100644
--- a/general/package/goke-osdrv-gk7205v200/goke-osdrv-gk7205v200.mk
+++ b/general/package/goke-osdrv-gk7205v200/goke-osdrv-gk7205v200.mk
@@ -10,7 +10,6 @@ GOKE_OSDRV_GK7205V200_LICENSE = MIT
 GOKE_OSDRV_GK7205V200_LICENSE_FILES = LICENSE
 GOKE_OSDRV_GK7205V200_INSTALL_STAGING = YES
 
-
 define GOKE_OSDRV_GK7205V200_INSTALL_STAGING_CMDS
 	$(INSTALL) -m 755 -d $(STAGING_DIR)/usr/include/goke
 	#$(INSTALL) -m 644 -t $(STAGING_DIR)/usr/include/goke $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/include/*
@@ -25,7 +24,6 @@ define GOKE_OSDRV_GK7205V200_INSTALL_STAGING_CMDS
 	## $(INSTALL) -m 644 -t $(BUILD_DIR)/goke-osdrv-gk7205v200/lib $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/lib/*.so
 endef
 
-
 define GOKE_OSDRV_GK7205V200_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_GOKE_PATH)/package/goke-osdrv-gk7205v200/files/script/S95goke
diff --git a/general/package/goke_patcher/goke_patcher.mk b/general/package/goke_patcher/goke_patcher.mk
index 099db8d8..d182b52c 100644
--- a/general/package/goke_patcher/goke_patcher.mk
+++ b/general/package/goke_patcher/goke_patcher.mk
@@ -6,7 +6,6 @@
 
 GOKE_PATCHER_VERSION = 0.1
 GOKE_PATCHER_INSTALL_TARGET = NO
-GOKE_PATCHER_INSTALL_STAGING = NO
 GOKE_PATCHER_SITE =
 GOKE_PATCHER_SOURCE =
 
diff --git a/general/package/grainmedia-osdrv-gm8136/grainmedia-osdrv-gm8136.mk b/general/package/grainmedia-osdrv-gm8136/grainmedia-osdrv-gm8136.mk
index ae570a51..460ca83e 100644
--- a/general/package/grainmedia-osdrv-gm8136/grainmedia-osdrv-gm8136.mk
+++ b/general/package/grainmedia-osdrv-gm8136/grainmedia-osdrv-gm8136.mk
@@ -9,7 +9,6 @@ GRAINMEDIA_OSDRV_GM8136_SITE =
 GRAINMEDIA_OSDRV_GM8136_LICENSE = MIT
 GRAINMEDIA_OSDRV_GM8136_LICENSE_FILES = LICENSE
 
-
 define GRAINMEDIA_OSDRV_GM8136_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/grainmedia-osdrv-gm8136/files/script/S95grainmedia
@@ -31,9 +30,3 @@ define GRAINMEDIA_OSDRV_GM8136_INSTALL_TARGET_CMDS
 endef
 
 $(eval $(generic-package))
-
-
-
-
-
-
diff --git a/general/package/grainmedia_patcher/grainmedia_patcher.mk b/general/package/grainmedia_patcher/grainmedia_patcher.mk
index 97c5d3c6..1ec50f1b 100644
--- a/general/package/grainmedia_patcher/grainmedia_patcher.mk
+++ b/general/package/grainmedia_patcher/grainmedia_patcher.mk
@@ -6,7 +6,6 @@
 
 GRAINMEDIA_PATCHER_VERSION = 0.1
 GRAINMEDIA_PATCHER_INSTALL_TARGET = NO
-GRAINMEDIA_PATCHER_INSTALL_STAGING = NO
 GRAINMEDIA_PATCHER_SITE =
 GRAINMEDIA_PATCHER_SOURCE =
 
diff --git a/general/package/hisi_gpio/Config.in b/general/package/hisi_gpio/Config.in
index dc11bbae..33b8f250 100644
--- a/general/package/hisi_gpio/Config.in
+++ b/general/package/hisi_gpio/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_HISI_GPIO
 	bool "hisi_gpio"
 	help
-	  Utility for diagnosing, displaying GPIO statuses and run commands
+	  Utility for diagnosing, displaying GPIO statuses and running
+	  commands.
 
 	  https://openipc.org
diff --git a/general/package/hisi_patcher/hisi_patcher.mk b/general/package/hisi_patcher/hisi_patcher.mk
index de0bc1ce..7dddb71a 100644
--- a/general/package/hisi_patcher/hisi_patcher.mk
+++ b/general/package/hisi_patcher/hisi_patcher.mk
@@ -6,7 +6,6 @@
 
 HISI_PATCHER_VERSION = 0.1
 HISI_PATCHER_INSTALL_TARGET = NO
-HISI_PATCHER_INSTALL_STAGING = NO
 HISI_PATCHER_SITE =
 HISI_PATCHER_SOURCE =
 
diff --git a/general/package/hisilicon-osdrv-hi3516av100/Config.in b/general/package/hisilicon-osdrv-hi3516av100/Config.in
index cd2d2a08..92538220 100644
--- a/general/package/hisilicon-osdrv-hi3516av100/Config.in
+++ b/general/package/hisilicon-osdrv-hi3516av100/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_HISILICON_OSDRV_HI3516AV100
 	bool "hisilicon-osdrv-hi3516av100"
 	help
-	  hisilicon-osdrv-hi3516av100 - Hisilicon kernel modules and libs
+	  hisilicon-osdrv-hi3516av100 - Hisilicon kernel modules
+	  and libs.
 
 	  https://openipc.org
diff --git a/general/package/hisilicon-osdrv-hi3516av100/hisilicon-osdrv-hi3516av100.mk b/general/package/hisilicon-osdrv-hi3516av100/hisilicon-osdrv-hi3516av100.mk
index 967c2742..f45098c3 100644
--- a/general/package/hisilicon-osdrv-hi3516av100/hisilicon-osdrv-hi3516av100.mk
+++ b/general/package/hisilicon-osdrv-hi3516av100/hisilicon-osdrv-hi3516av100.mk
@@ -9,7 +9,6 @@ HISILICON_OSDRV_HI3516AV100_SITE =
 HISILICON_OSDRV_HI3516AV100_LICENSE = MIT
 HISILICON_OSDRV_HI3516AV100_LICENSE_FILES = LICENSE
 
-
 define HISILICON_OSDRV_HI3516AV100_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516av100/files/script/S95hisilicon
@@ -91,7 +90,6 @@ define HISILICON_OSDRV_HI3516AV100_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/ $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516av100/files/lib/libtde.so
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/ $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516av100/files/lib/libupvqe.so
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/ $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516av100/files/lib/libVoiceEngine.so
-
 endef
 
 $(eval $(generic-package))
diff --git a/general/package/hisilicon-osdrv-hi3516cv100/Config.in b/general/package/hisilicon-osdrv-hi3516cv100/Config.in
index 73ba0267..02dc59eb 100644
--- a/general/package/hisilicon-osdrv-hi3516cv100/Config.in
+++ b/general/package/hisilicon-osdrv-hi3516cv100/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_HISILICON_OSDRV_HI3516CV100
 	bool "hisilicon-osdrv-hi3516cv100"
 	help
-	  hisilicon-osdrv-hi3516cv100 - Hisilicon kernel modules and libs
+	  hisilicon-osdrv-hi3516cv100 - Hisilicon kernel modules
+	  and libs.
 
 	  https://openipc.org
diff --git a/general/package/hisilicon-osdrv-hi3516cv100/hisilicon-osdrv-hi3516cv100.mk b/general/package/hisilicon-osdrv-hi3516cv100/hisilicon-osdrv-hi3516cv100.mk
index 3c3cc898..4ccca5c6 100644
--- a/general/package/hisilicon-osdrv-hi3516cv100/hisilicon-osdrv-hi3516cv100.mk
+++ b/general/package/hisilicon-osdrv-hi3516cv100/hisilicon-osdrv-hi3516cv100.mk
@@ -9,7 +9,6 @@ HISILICON_OSDRV_HI3516CV100_SITE =
 HISILICON_OSDRV_HI3516CV100_LICENSE = MIT
 HISILICON_OSDRV_HI3516CV100_LICENSE_FILES = LICENSE
 
-
 define HISILICON_OSDRV_HI3516CV100_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv100/files/script/S95hisilicon
diff --git a/general/package/hisilicon-osdrv-hi3516cv200/Config.in b/general/package/hisilicon-osdrv-hi3516cv200/Config.in
index d8357ff2..5ddd52b5 100644
--- a/general/package/hisilicon-osdrv-hi3516cv200/Config.in
+++ b/general/package/hisilicon-osdrv-hi3516cv200/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_HISILICON_OSDRV_HI3516CV200
 	bool "hisilicon-osdrv-hi3516cv200"
 	help
-	  hisilicon-osdrv-hi3516cv200 - Hisilicon kernel modules and libs
+	  hisilicon-osdrv-hi3516cv200 - Hisilicon kernel modules
+	  and libs.
 
 	  https://openipc.org
diff --git a/general/package/hisilicon-osdrv-hi3516cv200/hisilicon-osdrv-hi3516cv200.mk b/general/package/hisilicon-osdrv-hi3516cv200/hisilicon-osdrv-hi3516cv200.mk
index 491a9c9f..c0b70279 100644
--- a/general/package/hisilicon-osdrv-hi3516cv200/hisilicon-osdrv-hi3516cv200.mk
+++ b/general/package/hisilicon-osdrv-hi3516cv200/hisilicon-osdrv-hi3516cv200.mk
@@ -9,7 +9,6 @@ HISILICON_OSDRV_HI3516CV200_SITE =
 HISILICON_OSDRV_HI3516CV200_LICENSE = MIT
 HISILICON_OSDRV_HI3516CV200_LICENSE_FILES = LICENSE
 
-
 define HISILICON_OSDRV_HI3516CV200_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv200/files/script/S95hisilicon
@@ -18,7 +17,7 @@ define HISILICON_OSDRV_HI3516CV200_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv200/files/sensor/config/*.ini
 
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/lib/modules/4.9.37/hisilicon
-	
+
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv200/files/kmod/acodec.ko
 	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv200/files/kmod/adv_7179.ko
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv200/files/kmod/hi3518e_adec.ko
@@ -55,7 +54,7 @@ define HISILICON_OSDRV_HI3516CV200_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv200/files/kmod/sensor_spi.ko
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv200/files/kmod/sys_config.ko
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv200/files/kmod/wdt.ko
-	
+
 	# $(INSTALL) -m 644 -t $(TARGET_DIR)/lib/modules/4.9.37/hisilicon $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv200/files/kmod/xxx.ko
 
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
diff --git a/general/package/hisilicon-osdrv-hi3516cv300/Config.in b/general/package/hisilicon-osdrv-hi3516cv300/Config.in
index e25e7675..db172c1e 100644
--- a/general/package/hisilicon-osdrv-hi3516cv300/Config.in
+++ b/general/package/hisilicon-osdrv-hi3516cv300/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_HISILICON_OSDRV_HI3516CV300
 	bool "hisilicon-osdrv-hi3516cv300"
 	help
-	  hisilicon-osdrv-hi3516cv300 - Hisilicon kernel modules and libs
+	  hisilicon-osdrv-hi3516cv300 - Hisilicon kernel modules
+	  and libs.
 
 	  https://openipc.org
diff --git a/general/package/hisilicon-osdrv-hi3516cv300/hisilicon-osdrv-hi3516cv300.mk b/general/package/hisilicon-osdrv-hi3516cv300/hisilicon-osdrv-hi3516cv300.mk
index c871e6e5..836f2308 100644
--- a/general/package/hisilicon-osdrv-hi3516cv300/hisilicon-osdrv-hi3516cv300.mk
+++ b/general/package/hisilicon-osdrv-hi3516cv300/hisilicon-osdrv-hi3516cv300.mk
@@ -9,7 +9,6 @@ HISILICON_OSDRV_HI3516CV300_SITE =
 HISILICON_OSDRV_HI3516CV300_LICENSE = MIT
 HISILICON_OSDRV_HI3516CV300_LICENSE_FILES = LICENSE
 
-
 define HISILICON_OSDRV_HI3516CV300_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv300/files/script/S95hisilicon
diff --git a/general/package/hisilicon-osdrv-hi3516cv500/Config.in b/general/package/hisilicon-osdrv-hi3516cv500/Config.in
index 1796f25a..2466ae21 100644
--- a/general/package/hisilicon-osdrv-hi3516cv500/Config.in
+++ b/general/package/hisilicon-osdrv-hi3516cv500/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_HISILICON_OSDRV_HI3516CV500
 	bool "hisilicon-osdrv-hi3516cv500"
 	help
-	  hisilicon-osdrv-hi3516cv500 - Hisilicon kernel modules and libs
+	  hisilicon-osdrv-hi3516cv500 - Hisilicon kernel modules
+	  and libs.
 
 	  https://openipc.org
diff --git a/general/package/hisilicon-osdrv-hi3516cv500/hisilicon-osdrv-hi3516cv500.mk b/general/package/hisilicon-osdrv-hi3516cv500/hisilicon-osdrv-hi3516cv500.mk
index 7da3a9ea..79af4af7 100644
--- a/general/package/hisilicon-osdrv-hi3516cv500/hisilicon-osdrv-hi3516cv500.mk
+++ b/general/package/hisilicon-osdrv-hi3516cv500/hisilicon-osdrv-hi3516cv500.mk
@@ -9,7 +9,6 @@ HISILICON_OSDRV_HI3516CV500_SITE =
 HISILICON_OSDRV_HI3516CV500_LICENSE = MIT
 HISILICON_OSDRV_HI3516CV500_LICENSE_FILES = LICENSE
 
-
 define HISILICON_OSDRV_HI3516CV500_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516cv500/files/script/S95hisilicon
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/Config.in b/general/package/hisilicon-osdrv-hi3516ev300/Config.in
index e010dbed..1adecfc8 100644
--- a/general/package/hisilicon-osdrv-hi3516ev300/Config.in
+++ b/general/package/hisilicon-osdrv-hi3516ev300/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_HISILICON_OSDRV_HI3516EV300
 	bool "hisilicon-osdrv-hi3516ev300"
 	help
-	  hisilicon-osdrv-hi3516ev300 - Hisilicon kernel modules and libs
+	  hisilicon-osdrv-hi3516ev300 - Hisilicon kernel modules
+	  and libs.
 
 	  https://openipc.org
diff --git a/general/package/hisilicon-osdrv-hi3516ev300/hisilicon-osdrv-hi3516ev300.mk b/general/package/hisilicon-osdrv-hi3516ev300/hisilicon-osdrv-hi3516ev300.mk
index ba41170e..14d95efb 100644
--- a/general/package/hisilicon-osdrv-hi3516ev300/hisilicon-osdrv-hi3516ev300.mk
+++ b/general/package/hisilicon-osdrv-hi3516ev300/hisilicon-osdrv-hi3516ev300.mk
@@ -9,7 +9,6 @@ HISILICON_OSDRV_HI3516EV300_SITE =
 HISILICON_OSDRV_HI3516EV300_LICENSE = MIT
 HISILICON_OSDRV_HI3516EV300_LICENSE_FILES = LICENSE
 
-
 define HISILICON_OSDRV_HI3516EV300_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3516ev300/files/script/S95hisilicon
diff --git a/general/package/hisilicon-osdrv-hi3519v101/hisilicon-osdrv-hi3519v101.mk b/general/package/hisilicon-osdrv-hi3519v101/hisilicon-osdrv-hi3519v101.mk
index ae61b05e..f3eb97c3 100644
--- a/general/package/hisilicon-osdrv-hi3519v101/hisilicon-osdrv-hi3519v101.mk
+++ b/general/package/hisilicon-osdrv-hi3519v101/hisilicon-osdrv-hi3519v101.mk
@@ -9,7 +9,6 @@ HISILICON_OSDRV_HI3519V101_SITE =
 HISILICON_OSDRV_HI3519V101_LICENSE = MIT
 HISILICON_OSDRV_HI3519V101_LICENSE_FILES = LICENSE
 
-
 define HISILICON_OSDRV_HI3519V101_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_HISILICON_PATH)/package/hisilicon-osdrv-hi3519v101/files/script/S95hisilicon
diff --git a/general/package/ipctool/ipctool.mk b/general/package/ipctool/ipctool.mk
index 18f8d6a5..50fe2356 100644
--- a/general/package/ipctool/ipctool.mk
+++ b/general/package/ipctool/ipctool.mk
@@ -18,5 +18,4 @@ define IPCTOOL_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/ipcinfo
 endef
 
-
 $(eval $(cmake-package))
diff --git a/general/package/lame-openipc/lame-openipc.mk b/general/package/lame-openipc/lame-openipc.mk
index d4826a3b..77b7bb5e 100644
--- a/general/package/lame-openipc/lame-openipc.mk
+++ b/general/package/lame-openipc/lame-openipc.mk
@@ -32,5 +32,3 @@ endif
 LAME_OPENIPC_POST_CONFIGURE_HOOKS += LAME_OPENIPC_BIGENDIAN_ARCH
 
 $(eval $(autotools-package))
-
-
diff --git a/general/package/libevent-openipc/libevent-mbedtls.patch b/general/package/libevent-openipc/0001-libevent-mbedtls.patch
similarity index 100%
rename from general/package/libevent-openipc/libevent-mbedtls.patch
rename to general/package/libevent-openipc/0001-libevent-mbedtls.patch
diff --git a/general/package/libhv-openipc/Config.in b/general/package/libhv-openipc/Config.in
index 904c7b95..3461f1b6 100644
--- a/general/package/libhv-openipc/Config.in
+++ b/general/package/libhv-openipc/Config.in
@@ -1,7 +1,8 @@
 config BR2_PACKAGE_LIBHV_OPENIPC
 	bool "libhv-openipc"
 	help
-	  Like libevent, libev, and libuv, libhv provides event-loop with 
-	  non-blocking IO and timer, but simpler api and richer protocols.
+	  Like libevent, libev, and libuv, libhv provides event-loop
+	  with non-blocking IO and timer, but simpler api and richer
+	  protocols.
 
 	  https://github.com/ithewei/libhv
diff --git a/general/package/libhv-openipc/libhv-openipc.mk b/general/package/libhv-openipc/libhv-openipc.mk
index 2b2a0ff4..4439d381 100644
--- a/general/package/libhv-openipc/libhv-openipc.mk
+++ b/general/package/libhv-openipc/libhv-openipc.mk
@@ -9,7 +9,6 @@ LIBHV_OPENIPC_SITE = $(call github,ithewei,libhv,v$(LIBHV_OPENIPC_VERSION))
 LIBHV_OPENIPC_LICENSE = BSDv3-Clause
 LIBHV_OPENIPC_LICENSE_FILES = LICENSE
 
-
 LIBHV_OPENIPC_CONF_OPTS += \
 	--prefix=/usr \
 	--without-http-server \
@@ -18,7 +17,6 @@ LIBHV_OPENIPC_CONF_OPTS += \
 	--disable-ipv6 \
 	--disable-windump
 
-
 LIBHV_OPENIPC_MAKE_OPTS = \
 	CC="$(TARGET_CC)" \
 	CXX="$(TARGET_CXX)"
@@ -30,7 +28,6 @@ LIBHV_OPENIPC_MAKE_OPTS = \
 #	STRIP=$(TARGET_STRIP) \
 #	PREFIX="$(TARGET_DIR)" \
 
-
 define LIBHV_OPENIPC_CONFIGURE_CMDS
 	(cd $(@D); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_ARGS) \
@@ -38,7 +35,6 @@ define LIBHV_OPENIPC_CONFIGURE_CMDS
 		./configure $(LIBHV_OPENIPC_CONF_OPTS))
 endef
 
-
 define LIBHV_OPENIPC_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) $(LIBHV_OPENIPC_MAKE_OPTS) -C $(@D)
 endef
@@ -47,5 +43,4 @@ define LIBHV_OPENIPC_INSTALL_TARGET_CMDS
 	$(INSTALL) -D $(@D)/lib/libhv.so $(TARGET_DIR)/usr/lib/libhv.so
 endef
 
-
 $(eval $(generic-package))
diff --git a/general/package/libsrt-openipc/Config.in b/general/package/libsrt-openipc/Config.in
index 6417026d..69be1286 100644
--- a/general/package/libsrt-openipc/Config.in
+++ b/general/package/libsrt-openipc/Config.in
@@ -1,14 +1,12 @@
 config BR2_PACKAGE_LIBSRT_OPENIPC
 	bool "libsrt-openipc"
 	help
-	  Secure Reliable Transport (SRT) is an open source transport technology
-	  that optimizes streaming performance across unpredictable networks,
-	  such as the Internet.
+	  Secure Reliable Transport (SRT) is an open source transport
+	  technology that optimizes streaming performance across
+	  unpredictable networks, such as the Internet.
 
-	  SRT is applied to contribution and distribution endpoints as part of
-	  a video stream workflow to deliver the best quality and lowest latency
-	  video at all times.
+	  SRT is applied to contribution and distribution endpoints
+	  as part of a video stream workflow to deliver the best
+	  quality and lowest latency video at all times.
 
 	  https://github.com/Haivision/srt
-
-
diff --git a/general/package/libsrt-openipc/libsrt-openipc.mk b/general/package/libsrt-openipc/libsrt-openipc.mk
index f40f0712..61874e73 100644
--- a/general/package/libsrt-openipc/libsrt-openipc.mk
+++ b/general/package/libsrt-openipc/libsrt-openipc.mk
@@ -9,7 +9,6 @@ LIBSRT_OPENIPC_SITE = $(call github,Haivision,srt,v$(LIBSRT_OPENIPC_VERSION))
 LIBSRT_OPENIPC_LICENSE = MPLv2.0
 LIBSRT_OPENIPC_LICENSE_FILES = LICENSE
 
-
 LIBSRT_OPENIPC_CONF_OPTS += \
 	--prefix=/usr \
 	--disable-static \
@@ -17,7 +16,6 @@ LIBSRT_OPENIPC_CONF_OPTS += \
 	--disable-encryption \
 	--disable-apps
 
-
 define LIBSRT_OPENIPC_CONFIGURE_CMDS
 	(cd $(@D); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_ARGS) \
@@ -25,7 +23,6 @@ define LIBSRT_OPENIPC_CONFIGURE_CMDS
 		./configure $(LIBSRT_OPENIPC_CONF_OPTS))
 endef
 
-
 define LIBSRT_OPENIPC_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
 endef
@@ -36,5 +33,4 @@ define LIBSRT_OPENIPC_INSTALL_TARGET_CMDS
 	ln -sf libsrt.so.$(LIBSRT_OPENIPC_VERSION) $(TARGET_DIR)/usr/lib/libsrt.so.1.4
 endef
 
-
 $(eval $(generic-package))
diff --git a/general/package/linux-firmware-openipc/Config.in b/general/package/linux-firmware-openipc/Config.in
index ec8ba02e..6667dba4 100644
--- a/general/package/linux-firmware-openipc/Config.in
+++ b/general/package/linux-firmware-openipc/Config.in
@@ -6,7 +6,6 @@ config BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC
 
 	  https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
 
-
 if BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC
 
 menu "WiFi firmware"
@@ -22,9 +21,9 @@ config BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_RTL8188EU
 	  Realtek RTL8188EU
 
 config BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_ATHEROS_9271
-        bool "Atheros AR9271"
-        help
-          Atheros AR9271
+	bool "Atheros AR9271"
+	help
+	  Atheros AR9271
 
 endmenu
 
diff --git a/general/package/linux-firmware-openipc/linux-firmware-openipc.mk b/general/package/linux-firmware-openipc/linux-firmware-openipc.mk
index c97aca0b..d66e8216 100644
--- a/general/package/linux-firmware-openipc/linux-firmware-openipc.mk
+++ b/general/package/linux-firmware-openipc/linux-firmware-openipc.mk
@@ -5,9 +5,10 @@
 ################################################################################
 
 LINUX_FIRMWARE_OPENIPC_VERSION = 20190717
-LINUX_FIRMWARE_OPENIPC_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
-LINUX_FIRMWARE_OPENIPC_SITE_METHOD = git
-
+LINUX_FIRMWARE_OPENIPC_SOURCE = linux-firmware-$(LINUX_FIRMWARE_OPENIPC_VERSION).tar.gz
+LINUX_FIRMWARE_OPENIPC_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot
+#LINUX_FIRMWARE_OPENIPC_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
+#LINUX_FIRMWARE_OPENIPC_SITE_METHOD = git
 
 # WiFi RTL8188EU
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_RTL8188EU),y)
@@ -27,7 +28,6 @@ LINUX_FIRMWARE_OPENIPC_FILES += ath9k_htc/htc_9271-1.4.0.fw
 LINUX_FIRMWARE_OPENIPC_ALL_LICENSE_FILES += LICENCE.open-ath9k-htc-firmware
 endif
 
-
 ifneq ($(LINUX_FIRMWARE_OPENIPC_FILES),)
 define LINUX_FIRMWARE_OPENIPC_INSTALL_FILES
 	cd $(@D) && \
diff --git a/general/package/majestic-gk7205v200/majestic-gk7205v200.mk b/general/package/majestic-gk7205v200/majestic-gk7205v200.mk
index 9d811e01..960bc724 100644
--- a/general/package/majestic-gk7205v200/majestic-gk7205v200.mk
+++ b/general/package/majestic-gk7205v200/majestic-gk7205v200.mk
@@ -19,5 +19,4 @@ define MAJESTIC_GK7205V200_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/majestic
 endef
 
-
 $(eval $(generic-package))
diff --git a/general/package/majestic-hi3516av100/majestic-hi3516av100.mk b/general/package/majestic-hi3516av100/majestic-hi3516av100.mk
index fd90d029..af49b082 100644
--- a/general/package/majestic-hi3516av100/majestic-hi3516av100.mk
+++ b/general/package/majestic-hi3516av100/majestic-hi3516av100.mk
@@ -19,5 +19,4 @@ define MAJESTIC_HI3516AV100_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/majestic
 endef
 
-
 $(eval $(generic-package))
diff --git a/general/package/majestic-hi3516cv100/majestic-hi3516cv100.mk b/general/package/majestic-hi3516cv100/majestic-hi3516cv100.mk
index 2e77420a..09b0cea5 100644
--- a/general/package/majestic-hi3516cv100/majestic-hi3516cv100.mk
+++ b/general/package/majestic-hi3516cv100/majestic-hi3516cv100.mk
@@ -19,5 +19,4 @@ define MAJESTIC_HI3516CV100_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/majestic
 endef
 
-
 $(eval $(generic-package))
diff --git a/general/package/majestic-hi3516cv200/majestic-hi3516cv200.mk b/general/package/majestic-hi3516cv200/majestic-hi3516cv200.mk
index d30616ea..f9e0006b 100644
--- a/general/package/majestic-hi3516cv200/majestic-hi3516cv200.mk
+++ b/general/package/majestic-hi3516cv200/majestic-hi3516cv200.mk
@@ -19,5 +19,4 @@ define MAJESTIC_HI3516CV200_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/majestic
 endef
 
-
 $(eval $(generic-package))
diff --git a/general/package/majestic-hi3516cv300/majestic-hi3516cv300.mk b/general/package/majestic-hi3516cv300/majestic-hi3516cv300.mk
index 6acdf078..c86c702d 100644
--- a/general/package/majestic-hi3516cv300/majestic-hi3516cv300.mk
+++ b/general/package/majestic-hi3516cv300/majestic-hi3516cv300.mk
@@ -19,5 +19,4 @@ define MAJESTIC_HI3516CV300_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/majestic
 endef
 
-
 $(eval $(generic-package))
diff --git a/general/package/majestic-hi3516cv500/majestic-hi3516cv500.mk b/general/package/majestic-hi3516cv500/majestic-hi3516cv500.mk
index f6c7468b..bae7519a 100644
--- a/general/package/majestic-hi3516cv500/majestic-hi3516cv500.mk
+++ b/general/package/majestic-hi3516cv500/majestic-hi3516cv500.mk
@@ -19,5 +19,4 @@ define MAJESTIC_HI3516CV500_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/majestic
 endef
 
-
 $(eval $(generic-package))
diff --git a/general/package/majestic-hi3516ev300/majestic-hi3516ev300.mk b/general/package/majestic-hi3516ev300/majestic-hi3516ev300.mk
index d4282106..7011ddea 100644
--- a/general/package/majestic-hi3516ev300/majestic-hi3516ev300.mk
+++ b/general/package/majestic-hi3516ev300/majestic-hi3516ev300.mk
@@ -25,5 +25,4 @@ define MAJESTIC_HI3516EV300_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/majestic
 endef
 
-
 $(eval $(generic-package))
diff --git a/general/package/majestic-hi3519v101/majestic-hi3519v101.mk b/general/package/majestic-hi3519v101/majestic-hi3519v101.mk
index 038c9ac8..82085508 100644
--- a/general/package/majestic-hi3519v101/majestic-hi3519v101.mk
+++ b/general/package/majestic-hi3519v101/majestic-hi3519v101.mk
@@ -19,5 +19,4 @@ define MAJESTIC_HI3519V101_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/majestic
 endef
 
-
 $(eval $(generic-package))
diff --git a/general/package/majestic-nt9856x/majestic-nt9856x.mk b/general/package/majestic-nt9856x/majestic-nt9856x.mk
index eaa18837..d0d0bbb6 100644
--- a/general/package/majestic-nt9856x/majestic-nt9856x.mk
+++ b/general/package/majestic-nt9856x/majestic-nt9856x.mk
@@ -19,5 +19,4 @@ define MAJESTIC_NT9856X_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/majestic
 endef
 
-
 $(eval $(generic-package))
diff --git a/general/package/majestic-ssc335/majestic-ssc335.mk b/general/package/majestic-ssc335/majestic-ssc335.mk
index b4a4e2dd..4fff7f3c 100644
--- a/general/package/majestic-ssc335/majestic-ssc335.mk
+++ b/general/package/majestic-ssc335/majestic-ssc335.mk
@@ -19,5 +19,4 @@ define MAJESTIC_SSC335_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/majestic
 endef
 
-
 $(eval $(generic-package))
diff --git a/general/package/majestic-xm510/majestic-xm510.mk b/general/package/majestic-xm510/majestic-xm510.mk
index 54dc563d..5b4df9d9 100644
--- a/general/package/majestic-xm510/majestic-xm510.mk
+++ b/general/package/majestic-xm510/majestic-xm510.mk
@@ -19,5 +19,4 @@ define MAJESTIC_XM510_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/majestic
 endef
 
-
 $(eval $(generic-package))
diff --git a/general/package/majestic-xm530/majestic-xm530.mk b/general/package/majestic-xm530/majestic-xm530.mk
index 18ed55c8..9c864956 100644
--- a/general/package/majestic-xm530/majestic-xm530.mk
+++ b/general/package/majestic-xm530/majestic-xm530.mk
@@ -19,5 +19,4 @@ define MAJESTIC_XM530_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/majestic
 endef
 
-
 $(eval $(generic-package))
diff --git a/general/package/microbe-web/Config.in b/general/package/microbe-web/Config.in
index 82ce3d99..a9ad5669 100644
--- a/general/package/microbe-web/Config.in
+++ b/general/package/microbe-web/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_MICROBE_WEB
 	bool "microbe-web"
 	help
-	  The simplest web interface constructor based on httpd and haserl
+	  The simplest web interface constructor based on
+	  httpd and haserl.
 
 	  https://openipc.org
diff --git a/general/package/mt7601u-ap-openipc/00_optimization.patch b/general/package/mt7601u-ap-openipc/0001-optimization.patch
similarity index 100%
rename from general/package/mt7601u-ap-openipc/00_optimization.patch
rename to general/package/mt7601u-ap-openipc/0001-optimization.patch
diff --git a/general/package/mt7601u-ap-openipc/mt7601u-ap-openipc.mk b/general/package/mt7601u-ap-openipc/mt7601u-ap-openipc.mk
index 41f5ff7c..a3c1ee61 100644
--- a/general/package/mt7601u-ap-openipc/mt7601u-ap-openipc.mk
+++ b/general/package/mt7601u-ap-openipc/mt7601u-ap-openipc.mk
@@ -4,7 +4,6 @@
 #
 ################################################################################
 
-
 MT7601U_AP_OPENIPC_VERSION = fd4a47e55af879f8a1affb89cfc1e91b8aa45306
 MT7601U_AP_OPENIPC_SITE = $(call github,muratdemirtas,MT7601u,$(MT7601U_AP_OPENIPC_VERSION))
 
diff --git a/general/package/node-exporter/node-exporter.mk b/general/package/node-exporter/node-exporter.mk
index 4444d93b..6ba18e71 100644
--- a/general/package/node-exporter/node-exporter.mk
+++ b/general/package/node-exporter/node-exporter.mk
@@ -10,7 +10,6 @@ NODE_EXPORTER_LICENSE = MIT
 NODE_EXPORTER_LICENSE_FILES = LICENSE
 NODE_EXPORTER_INSTALL_STAGING = YES
 
-
 define NODE_EXPORTER_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(TOPDIR)/../general/package/node-exporter/files/script/S99node-exporter
@@ -23,9 +22,3 @@ define NODE_EXPORTER_INSTALL_TARGET_CMDS
 endef
 
 $(eval $(generic-package))
-
-
-
-
-
-
diff --git a/general/package/novatek-osdrv-nt9856x/novatek-osdrv-nt9856x.mk b/general/package/novatek-osdrv-nt9856x/novatek-osdrv-nt9856x.mk
index b2607196..99dd32b2 100644
--- a/general/package/novatek-osdrv-nt9856x/novatek-osdrv-nt9856x.mk
+++ b/general/package/novatek-osdrv-nt9856x/novatek-osdrv-nt9856x.mk
@@ -9,7 +9,6 @@ NOVATEK_OSDRV_NT9856X_SITE =
 NOVATEK_OSDRV_NT9856X_LICENSE = MIT
 NOVATEK_OSDRV_NT9856X_LICENSE_FILES = LICENSE
 
-
 define NOVATEK_OSDRV_NT9856X_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_NOVATEK_PATH)/package/novatek-osdrv-nt9856x/files/script/S95novatek
@@ -87,7 +86,6 @@ define NOVATEK_OSDRV_NT9856X_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/ $(BR2_EXTERNAL_NOVATEK_PATH)/package/novatek-osdrv-nt9856x/files/lib/libhdal.so
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/ $(BR2_EXTERNAL_NOVATEK_PATH)/package/novatek-osdrv-nt9856x/files/lib/libvendor_isp.so
 	$(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/ $(BR2_EXTERNAL_NOVATEK_PATH)/package/novatek-osdrv-nt9856x/files/lib/libvos.so
-
 endef
 
 $(eval $(generic-package))
diff --git a/general/package/novatek_patcher/novatek_patcher.mk b/general/package/novatek_patcher/novatek_patcher.mk
index 96790af2..8ff6c18c 100644
--- a/general/package/novatek_patcher/novatek_patcher.mk
+++ b/general/package/novatek_patcher/novatek_patcher.mk
@@ -6,7 +6,6 @@
 
 NOVATEK_PATCHER_VERSION = 0.1
 NOVATEK_PATCHER_INSTALL_TARGET = NO
-NOVATEK_PATCHER_INSTALL_STAGING = NO
 NOVATEK_PATCHER_SITE =
 NOVATEK_PATCHER_SOURCE =
 
diff --git a/general/package/openhisilicon/openhisilicon.mk b/general/package/openhisilicon/openhisilicon.mk
index b17338c9..b7f2480b 100644
--- a/general/package/openhisilicon/openhisilicon.mk
+++ b/general/package/openhisilicon/openhisilicon.mk
@@ -13,6 +13,5 @@ OPENHISILICON_MODULE_MAKE_OPTS = \
 	KVER=$(LINUX_VERSION_PROBED) \
 	KSRC=$(LINUX_DIR)
 
-
 $(eval $(kernel-module))
 $(eval $(generic-package))
diff --git a/general/package/rtl8188eus-openipc/000-apmode.patch b/general/package/rtl8188eus-openipc/0001-apmode.patch
similarity index 97%
rename from general/package/rtl8188eus-openipc/000-apmode.patch
rename to general/package/rtl8188eus-openipc/0001-apmode.patch
index ee31342b..68ea4827 100644
--- a/general/package/rtl8188eus-openipc/000-apmode.patch
+++ b/general/package/rtl8188eus-openipc/0001-apmode.patch
@@ -2,9 +2,9 @@
 +++ b/Makefile	2021-12-18 12:07:01.433235328 +0200
 @@ -2055,6 +2056,7 @@
  else
- 
+
  export CONFIG_RTL8188EU = m
 +EXTRA_CFLAGS += -DCONFIG_AP_MODE -DCONFIG_RTW_HOSTAPD_ACS -DCONFIG_RTW_MESH
- 
+
  all: modules
- 
+
diff --git a/general/package/rtl8188eus-openipc/Config.in b/general/package/rtl8188eus-openipc/Config.in
index af9fc91e..5bda253a 100644
--- a/general/package/rtl8188eus-openipc/Config.in
+++ b/general/package/rtl8188eus-openipc/Config.in
@@ -2,13 +2,14 @@ config BR2_PACKAGE_RTL8188EUS_OPENIPC
 	bool "rtl8188eus-openipc"
 	depends on BR2_LINUX_KERNEL
 	help
-	  A standalone driver for the RTL8188EU/RTL8188EUS/RTL8188ETV USB Wi-Fi adapter.
+	  A standalone driver for the RTL8188EU/RTL8188EUS/RTL8188ETV
+	  USB Wi-Fi adapter.
 
 	  Make sure your target kernel has the CONFIG_WIRELESS_EXT
 	  config option enabled.
 
-	  Note: this package needs a firmware loading mechanism to load
-	  the binary blob for the chip to work.
+	  Note: this package needs a firmware loading mechanism to
+	  load the binary blob for the chip to work.
 
 	  https://github.com/aircrack-ng/rtl8188eus/
 
diff --git a/general/package/rtl8188fu-openipc/00_optimization.patch b/general/package/rtl8188fu-openipc/0001-optimization.patch
similarity index 100%
rename from general/package/rtl8188fu-openipc/00_optimization.patch
rename to general/package/rtl8188fu-openipc/0001-optimization.patch
diff --git a/general/package/rtl8812au-openipc/000-disable_8814_8821.patch b/general/package/rtl8812au-openipc/0001-disable_8814_8821.patch
similarity index 99%
rename from general/package/rtl8812au-openipc/000-disable_8814_8821.patch
rename to general/package/rtl8812au-openipc/0001-disable_8814_8821.patch
index 0cef5850..24a0ba56 100644
--- a/general/package/rtl8812au-openipc/000-disable_8814_8821.patch
+++ b/general/package/rtl8812au-openipc/0001-disable_8814_8821.patch
@@ -1,7 +1,7 @@
 --- a/Makefile	2022-01-23 16:37:12.818897741 +0300
 +++ b/Makefile	2022-01-23 16:37:49.374948068 +0300
 @@ -22,8 +22,8 @@
- 
+
  ########################## WIFI IC ############################
  CONFIG_RTL8812A = y
 -CONFIG_RTL8821A = y
@@ -14,9 +14,9 @@
 @@ -178,7 +178,7 @@
  HCI_NAME = usb
  endif
- 
+
 -ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_y_y)
 +ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_n_n)
- 
+
  EXTRA_CFLAGS += -DDRV_NAME=\"rtl88XXau\"
  ifeq ($(CONFIG_USB_HCI), y)
diff --git a/general/package/rtl8812au-openipc/Config.in b/general/package/rtl8812au-openipc/Config.in
index 958a6f38..a8f08bde 100644
--- a/general/package/rtl8812au-openipc/Config.in
+++ b/general/package/rtl8812au-openipc/Config.in
@@ -2,13 +2,14 @@ config BR2_PACKAGE_RTL8812AU_OPENIPC
 	bool "rtl8812au-openipc"
 	depends on BR2_LINUX_KERNEL
 	help
-	  A standalone driver for the RTL8812AU / RTL8821AU Dual Band USB Wi-Fi adapter.
+	  A standalone driver for the RTL8812AU / RTL8821AU Dual Band
+	  USB Wi-Fi adapter.
 
 	  Make sure your target kernel has the CONFIG_WIRELESS_EXT
 	  config option enabled.
 
-	  Note: this package needs a firmware loading mechanism to load
-	  the binary blob for the chip to work.
+	  Note: this package needs a firmware loading mechanism to
+	  load the binary blob for the chip to work.
 
 	  https://github.com/aircrack-ng/rtl8812au/
 
diff --git a/general/package/rtw-hostapd/Config.in b/general/package/rtw-hostapd/Config.in
index dd37ba43..fedd23da 100644
--- a/general/package/rtw-hostapd/Config.in
+++ b/general/package/rtw-hostapd/Config.in
@@ -38,7 +38,8 @@ config BR2_PACKAGE_RTW_HOSTAPD_DRIVER_RTW
 	select BR2_PACKAGE_LIBNL
 	select BR2_PACKAGE_RTW_HOSTAPD_HAS_WIFI_DRIVERS
 	help
-	  Enable support for drivers using the Realtek proprietary interface.
+	  Enable support for drivers using the Realtek proprietary
+	  interface.
 
 comment "rtw driver needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/general/package/sigmastar-osdrv-ssc335/files/lib/libmi_vpe.so b/general/package/sigmastar-osdrv-ssc335/files/lib/libmi_vpe.so
old mode 100755
new mode 100644
diff --git a/general/package/sigmastar-osdrv-ssc335/files/sample/crutches/01_vpe_fixed.patch b/general/package/sigmastar-osdrv-ssc335/files/sample/crutches/0001-vpe_fixed.patch
similarity index 100%
rename from general/package/sigmastar-osdrv-ssc335/files/sample/crutches/01_vpe_fixed.patch
rename to general/package/sigmastar-osdrv-ssc335/files/sample/crutches/0001-vpe_fixed.patch
diff --git a/general/package/sigmastar-osdrv-ssc335/sigmastar-osdrv-ssc335.mk b/general/package/sigmastar-osdrv-ssc335/sigmastar-osdrv-ssc335.mk
index 977da358..a43f5519 100644
--- a/general/package/sigmastar-osdrv-ssc335/sigmastar-osdrv-ssc335.mk
+++ b/general/package/sigmastar-osdrv-ssc335/sigmastar-osdrv-ssc335.mk
@@ -9,7 +9,6 @@ SIGMASTAR_OSDRV_SSC335_SITE =
 SIGMASTAR_OSDRV_SSC335_LICENSE = MIT
 SIGMASTAR_OSDRV_SSC335_LICENSE_FILES = LICENSE
 
-
 define SIGMASTAR_OSDRV_SSC335_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/sigmastar-osdrv-ssc335/files/script/S95sigmastar
@@ -74,9 +73,3 @@ define SIGMASTAR_OSDRV_SSC335_INSTALL_TARGET_CMDS
 endef
 
 $(eval $(generic-package))
-
-
-
-
-
-
diff --git a/general/package/sigmastar_patcher/sigmastar_patcher.mk b/general/package/sigmastar_patcher/sigmastar_patcher.mk
index 28629ec9..3952b191 100644
--- a/general/package/sigmastar_patcher/sigmastar_patcher.mk
+++ b/general/package/sigmastar_patcher/sigmastar_patcher.mk
@@ -6,7 +6,6 @@
 
 SIGMASTAR_PATCHER_VERSION = 0.1
 SIGMASTAR_PATCHER_INSTALL_TARGET = NO
-SIGMASTAR_PATCHER_INSTALL_STAGING = NO
 SIGMASTAR_PATCHER_SITE =
 SIGMASTAR_PATCHER_SOURCE =
 
diff --git a/general/package/uacme-openipc/uacme.sh.patch b/general/package/uacme-openipc/0001-uacme.sh.patch
similarity index 99%
rename from general/package/uacme-openipc/uacme.sh.patch
rename to general/package/uacme-openipc/0001-uacme.sh.patch
index c4b916c5..ed480a13 100644
--- a/general/package/uacme-openipc/uacme.sh.patch
+++ b/general/package/uacme-openipc/0001-uacme.sh.patch
@@ -3,12 +3,12 @@
 @@ -16,7 +16,7 @@
  # You should have received a copy of the GNU General Public License
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
+
 -CHALLENGE_PATH="${UACME_CHALLENGE_PATH:-/var/www/.well-known/acme-challenge}"
 +CHALLENGE_PATH="${UACME_CHALLENGE_PATH:-/tmp/.well-known/acme-challenge}"
  ARGS=5
  E_BADARGS=85
- 
+
 @@ -36,6 +36,7 @@ case "$METHOD" in
      "begin")
          case "$TYPE" in
diff --git a/general/package/uacme-openipc/Config.in b/general/package/uacme-openipc/Config.in
index f70091ec..00daa9e4 100644
--- a/general/package/uacme-openipc/Config.in
+++ b/general/package/uacme-openipc/Config.in
@@ -22,8 +22,8 @@ config BR2_PACKAGE_UACME_OPENIPC_UALPN
 	depends on BR2_PACKAGE_OPENSSL || BR2_PACKAGE_GNUTLS
 	select BR2_PACKAGE_LIBEV
 	help
-	  Build and install ualpn, the transparent proxying tls-alpn-01
-	  challenge responder.
+	  Build and install ualpn, the transparent proxying
+	  tls-alpn-01 challenge responder.
 
 comment "ualpn needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/general/package/uqmi/uqmi.mk b/general/package/uqmi/uqmi.mk
index 2c8938a8..4356b476 100644
--- a/general/package/uqmi/uqmi.mk
+++ b/general/package/uqmi/uqmi.mk
@@ -10,4 +10,4 @@ UQMI_DEPENDENCIES = json-c-openipc libubox
 UQMI_LICENSE = LGPL-2.0+
 UQMI_LICENSE_FILES = COPYING
 
-$(eval $(cmake-package))
\ No newline at end of file
+$(eval $(cmake-package))
diff --git a/general/package/vtund-openipc/01_vtund-3.0.2_fix_makefile.patch b/general/package/vtund-openipc/0001-vtund-3.0.2_fix_makefile.patch
similarity index 90%
rename from general/package/vtund-openipc/01_vtund-3.0.2_fix_makefile.patch
rename to general/package/vtund-openipc/0001-vtund-3.0.2_fix_makefile.patch
index cd9bcf18..c436e1a6 100644
--- a/general/package/vtund-openipc/01_vtund-3.0.2_fix_makefile.patch
+++ b/general/package/vtund-openipc/0001-vtund-3.0.2_fix_makefile.patch
@@ -1,13 +1,13 @@
 --- a/Makefile.in	2008-01-08 01:35:55.000000000 +0300
 +++ b/Makefile.in	2021-05-07 22:18:22.310801557 +0300
 @@ -74,27 +74,27 @@
- 
+
  distclean: clean
  	rm -f $(CONFIGURE_FILES)
--	rm -f `cat vtun.drivers`	
+-	rm -f `cat vtun.drivers`
 +	rm -f `cat vtun.drivers`
- 
- install_man: 
+
+ install_man:
 -	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(MAN_DIR)/man8
 -	$(INSTALL) -m 644 $(INSTALL_OWNER) vtund.8 $(DESTDIR)$(MAN_DIR)/man8
 -	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(MAN_DIR)/man5
@@ -16,17 +16,17 @@
 +	$(INSTALL) -m 644 vtund.8 $(DESTDIR)$(MAN_DIR)/man8
 +	$(INSTALL) -d -m 755 $(DESTDIR)$(MAN_DIR)/man5
 +	$(INSTALL) -m 644 $vtund.conf.5 $(DESTDIR)$(MAN_DIR)/man5
- 	rm -f $(DESTDIR)$(MAN_DIR)/man8/vtun.8 
- 	ln -s vtund.8 $(DESTDIR)$(MAN_DIR)/man8/vtun.8 
- 
- install_config: 
+ 	rm -f $(DESTDIR)$(MAN_DIR)/man8/vtun.8
+ 	ln -s vtund.8 $(DESTDIR)$(MAN_DIR)/man8/vtun.8
+
+ install_config:
 -	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(ETC_DIR)
 +	$(INSTALL) -d -m 755 $(DESTDIR)$(ETC_DIR)
  	if [ ! -f $(ETC_DIR)/vtund.conf ]; then \
 -	  $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(DESTDIR)$(ETC_DIR); \
 +	  $(INSTALL) -m 600 vtund.conf $(DESTDIR)$(ETC_DIR); \
  	fi
- 
+
 -install: vtund install_config install_man
 -	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(VAR_DIR)/run
 -	$(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(STAT_DIR)
@@ -39,5 +39,5 @@
 +	$(INSTALL) -d -m 755 $(DESTDIR)$(LOCK_DIR)
 +	$(INSTALL) -d -m 755 $(DESTDIR)$(SBIN_DIR)
 +	$(INSTALL) -m 755 vtund $(DESTDIR)$(SBIN_DIR)
- 
+
  # DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/general/package/vtund-openipc/91_vtund-3.0.2_keepalive_syslog.patch b/general/package/vtund-openipc/0091-vtund-3.0.2_keepalive_syslog.patch
similarity index 96%
rename from general/package/vtund-openipc/91_vtund-3.0.2_keepalive_syslog.patch
rename to general/package/vtund-openipc/0091-vtund-3.0.2_keepalive_syslog.patch
index 5fc9243e..168c802f 100644
--- a/general/package/vtund-openipc/91_vtund-3.0.2_keepalive_syslog.patch
+++ b/general/package/vtund-openipc/0091-vtund-3.0.2_keepalive_syslog.patch
@@ -1,7 +1,7 @@
 --- a/linkfd.c	2008-01-08 00:35:43.000000000 +0200
 +++ b/linkfd.c	2021-12-21 20:08:27.197338347 +0300
 @@ -264,6 +264,7 @@
- 		 break;	
+ 		 break;
  	      }
  	      /* Send ECHO request */
 +	      vtun_syslog(LOG_INFO,"Session %s sending ping", lfd_host->host);
diff --git a/general/package/wifibroadcast/000-makefile.patch b/general/package/wifibroadcast/0001-makefile.patch
similarity index 99%
rename from general/package/wifibroadcast/000-makefile.patch
rename to general/package/wifibroadcast/0001-makefile.patch
index 595986c8..43fc45b0 100644
--- a/general/package/wifibroadcast/000-makefile.patch
+++ b/general/package/wifibroadcast/0001-makefile.patch
@@ -6,11 +6,11 @@
 -COMMIT ?= $(shell git rev-parse HEAD)
 -VERSION ?= $(shell $(PYTHON) ./version.py $(shell git show -s --format="%ct" $(shell git rev-parse HEAD)) $(shell git rev-parse --abbrev-ref HEAD))
 +VERSION ?= $(shell git rev-parse HEAD)
- 
+
 -export VERSION COMMIT
 +LDFLAGS := -lrt -lpcap -lsodium
 +CFLAGS := -Wall -O2 -DWFB_VERSION='"$(VERSION)"'
- 
+
 -_LDFLAGS := $(LDFLAGS) -lrt -lpcap -lsodium
 -_CFLAGS := $(CFLAGS) -Wall -O2 -DWFB_VERSION='"$(VERSION)-$(shell /bin/bash -c '_tmp=$(COMMIT); echo $${_tmp::8}')"'
 -
@@ -25,23 +25,23 @@
 -gs.key: wfb_keygen
 -	@if ! [ -f gs.key ]; then ./wfb_keygen; fi
 +all: wfb_rx wfb_tx wfb_keygen
- 
+
  src/%.o: src/%.c src/*.h
 -	$(CC) $(_CFLAGS) -std=gnu99 -c -o $@ $<
 +	$(CC) $(CFLAGS) -std=gnu99 -c -o $@ $<
- 
+
  src/%.o: src/%.cpp src/*.hpp src/*.h
 -	$(CXX) $(_CFLAGS) -std=gnu++11 -c -o $@ $<
 +	$(CXX) $(CFLAGS) -std=gnu++11 -c -o $@ $<
- 
+
  wfb_rx: src/rx.o src/radiotap.o src/fec.o src/wifibroadcast.o
 -	$(CXX) -o $@ $^ $(_LDFLAGS)
 +	$(CXX) -o $@ $^ $(LDFLAGS)
- 
+
  wfb_tx: src/tx.o src/fec.o src/wifibroadcast.o
 -	$(CXX) -o $@ $^ $(_LDFLAGS)
 +	$(CXX) -o $@ $^ $(LDFLAGS)
- 
+
  wfb_keygen: src/keygen.o
 -	$(CC) -o $@ $^ $(_LDFLAGS)
 -
@@ -63,7 +63,7 @@
 -	$(PYTHON) ./setup.py bdist --plat-name linux-$(ARCH)
 -	rm -rf wifibroadcast.egg-info/
 +	$(CC) -o $@ $^ $(LDFLAGS)
- 
+
  clean:
 -	rm -rf env wfb_rx wfb_tx wfb_keygen dist deb_dist build wifibroadcast.egg-info _trial_temp *~ src/*.o
 -
diff --git a/general/package/wifibroadcast/Config.in b/general/package/wifibroadcast/Config.in
index c70bf15d..5071c009 100644
--- a/general/package/wifibroadcast/Config.in
+++ b/general/package/wifibroadcast/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_WIFIBROADCAST
-        bool "wifibroadcast"
-        help
-          Transmit hd video over wifi for the UAV
-
-          https://github.com/svpcom/wifibroadcast
+	bool "wifibroadcast"
+	help
+	  Transmit hd video over wifi for the UAV.
 
+	  https://github.com/svpcom/wifibroadcast
diff --git a/general/package/xiongmai-osdrv-xm510/xiongmai-osdrv-xm510.mk b/general/package/xiongmai-osdrv-xm510/xiongmai-osdrv-xm510.mk
index 663265ac..ecebd90d 100644
--- a/general/package/xiongmai-osdrv-xm510/xiongmai-osdrv-xm510.mk
+++ b/general/package/xiongmai-osdrv-xm510/xiongmai-osdrv-xm510.mk
@@ -9,7 +9,6 @@ XIONGMAI_OSDRV_XM510_SITE =
 XIONGMAI_OSDRV_XM510_LICENSE = MIT
 XIONGMAI_OSDRV_XM510_LICENSE_FILES = LICENSE
 
-
 define XIONGMAI_OSDRV_XM510_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_XIONGMAI_PATH)/package/xiongmai-osdrv-xm510/files/script/S95xiongmai
@@ -32,9 +31,3 @@ define XIONGMAI_OSDRV_XM510_INSTALL_TARGET_CMDS
 endef
 
 $(eval $(generic-package))
-
-
-
-
-
-
diff --git a/general/package/xiongmai-osdrv-xm530/xiongmai-osdrv-xm530.mk b/general/package/xiongmai-osdrv-xm530/xiongmai-osdrv-xm530.mk
index 4ce35db6..72df1504 100644
--- a/general/package/xiongmai-osdrv-xm530/xiongmai-osdrv-xm530.mk
+++ b/general/package/xiongmai-osdrv-xm530/xiongmai-osdrv-xm530.mk
@@ -9,7 +9,6 @@ XIONGMAI_OSDRV_XM530_SITE =
 XIONGMAI_OSDRV_XM530_LICENSE = MIT
 XIONGMAI_OSDRV_XM530_LICENSE_FILES = LICENSE
 
-
 define XIONGMAI_OSDRV_XM530_INSTALL_TARGET_CMDS
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
 	$(INSTALL) -m 755 -t $(TARGET_DIR)/etc/init.d $(BR2_EXTERNAL_XIONGMAI_PATH)/package/xiongmai-osdrv-xm530/files/script/S95xiongmai
@@ -41,9 +40,3 @@ define XIONGMAI_OSDRV_XM530_INSTALL_TARGET_CMDS
 endef
 
 $(eval $(generic-package))
-
-
-
-
-
-
diff --git a/general/package/xiongmai_patcher/xiongmai_patcher.mk b/general/package/xiongmai_patcher/xiongmai_patcher.mk
index 1e12bb60..bf829c85 100644
--- a/general/package/xiongmai_patcher/xiongmai_patcher.mk
+++ b/general/package/xiongmai_patcher/xiongmai_patcher.mk
@@ -6,7 +6,6 @@
 
 XIONGMAI_PATCHER_VERSION = 0.1
 XIONGMAI_PATCHER_INSTALL_TARGET = NO
-XIONGMAI_PATCHER_INSTALL_STAGING = NO
 XIONGMAI_PATCHER_SITE =
 XIONGMAI_PATCHER_SOURCE =
 
diff --git a/general/package/xmdp/xmdp.mk b/general/package/xmdp/xmdp.mk
index df40b356..a31423fb 100644
--- a/general/package/xmdp/xmdp.mk
+++ b/general/package/xmdp/xmdp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MCOOKIE_LICENSE = Public Domain
+XMDP_LICENSE = Public Domain
 
 define XMDP_EXTRACT_CMDS
 	cp package/x11r7/mcookie/mcookie.c $(@D)/
diff --git a/general/package/yaml-cli/Config.in b/general/package/yaml-cli/Config.in
index 0cc2765c..6de81cc2 100644
--- a/general/package/yaml-cli/Config.in
+++ b/general/package/yaml-cli/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_YAML_CLI
-	select BR2_PACKAGE_LIBYAML
 	bool "yaml-cli"
+	select BR2_PACKAGE_LIBYAML
 	help
 	  yaml-cli - console configurator for YAML files