From 66c237a78fe1b8ad84c232ce050bedddd622e51b Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 20 Apr 2024 19:32:43 -0700 Subject: [PATCH] mtd-rw: update version to latest master Remove local patch as upstream has a different solution applied. Use PKG_SOURCE_DATE to get rid of weird apk version. Remove various variables that are default anyway. Signed-off-by: Rosen Penev --- kernel/mtd-rw/Makefile | 11 ++++----- kernel/mtd-rw/patches/0001-mtd-disabled.patch | 24 ------------------- 2 files changed, 5 insertions(+), 30 deletions(-) delete mode 100644 kernel/mtd-rw/patches/0001-mtd-disabled.patch diff --git a/kernel/mtd-rw/Makefile b/kernel/mtd-rw/Makefile index b18b91c221..433f679e82 100644 --- a/kernel/mtd-rw/Makefile +++ b/kernel/mtd-rw/Makefile @@ -9,14 +9,13 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=mtd-rw -PKG_RELEASE:=2 +PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_MIRROR_HASH:=c44db17c3e05079116a1704f277642c9ce6f5ca4fa380c60f7e6d44509dc16be -PKG_SOURCE_URL:=https://github.com/jclehner/mtd-rw.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_SUBDIR=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=7e8562067d6a366c8cbaa8084396c33b7e12986b +PKG_SOURCE_URL:=https://github.com/jclehner/mtd-rw +PKG_SOURCE_DATE:=2021-02-28 +PKG_SOURCE_VERSION:=e87767395a6d27380196702f5f7bf98e92774f3f +PKG_MIRROR_HASH:=984218d7a8e1252419c45ef313f23fb6e5edfa83088f68a4a356b795444ab381 PKG_MAINTAINER:=Joseph C. Lehner PKG_LICENSE=GPL-2.0 diff --git a/kernel/mtd-rw/patches/0001-mtd-disabled.patch b/kernel/mtd-rw/patches/0001-mtd-disabled.patch deleted file mode 100644 index b21d9562f8..0000000000 --- a/kernel/mtd-rw/patches/0001-mtd-disabled.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/mtd-rw.c -+++ b/mtd-rw.c -@@ -54,7 +54,11 @@ MODULE_PARM_DESC(i_want_a_brick, "Make a - - static int set_writeable(unsigned n, bool w) - { -+#ifndef CONFIG_MTD -+ struct mtd_info *mtd = -ENOSYS; -+#else - struct mtd_info *mtd = get_mtd_device(NULL, n); -+#endif - int err; - - if (IS_ERR(mtd)) { -@@ -76,7 +80,9 @@ static int set_writeable(unsigned n, boo - err = 0; - } - -+#ifdef CONFIG_MTD - put_mtd_device(mtd); -+#endif - return err; - } -