HackENS/liminix-fork
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

apply mtdpslit patch only for openwrt kernel

Browse source 
it doesn't apply to mainline because there's no mtdsplit
in mainline
This commit is contained in:
Daniel Barlow 2023-09-26 18:40:22 +01:00
parent d0c2b3b274
commit abd01a7809
3 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pkgs/openwrt/default.nix
View file

@ -26,6 +26,7 @@ let
patch --batch -p1 --reverse < ${src}/target/linux/generic/pending-5.15/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch
patches ${src}/target/linux/generic/hack-5.15/*.patch
patches ${src}/target/linux/${family}/patches-5.15/*.patch
patches ${./make-mtdsplit-jffs2-endian-agnostic.patch}
'';
in {
inherit src;

25
pkgs/openwrt/make-mtdsplit-jffs2-endian-agnostic.patch Normal file
View file

@ -0,0 +1,25 @@
From 12345790 Tue Sep 26 18:30:44 2023
From: Daniel Barlow <dan@telent.net>
Date: Tue Sep 26 18:29:47 BST 2023
Subject: mtdsplit: find magic of little-endian JFFS2
On a little-endian CPU, the little-endian JFFS2 magic
appears to be word-swapped.
There is probably a better way to implement this; if you are reading
this patch you are probably well-qualified to do that and upstream it
to OpenWrt
diff --git a/drivers/mtd/mtdsplit/mtdsplit.c b/drivers/mtd/mtdsplit/mtdsplit.c
index b2e51dcfc6..533af0298e 100644
--- a/drivers/mtd/mtdsplit/mtdsplit.c
+++ b/drivers/mtd/mtdsplit/mtdsplit.c
@@ -92,6 +93,6 @@
*type = MTDSPLIT_PART_TYPE_SQUASHFS;
return 0;
- } else if (magic == 0x19852003) {
+ } else if ((magic == 0x19852003) || (magic == 0x20031985)) {
if (type)
*type = MTDSPLIT_PART_TYPE_JFFS2;
return 0;