Problem stage2 patches arm64

[Gradhoc-aeimil]

Hi I'm trying to build an image with the branch arm64 in a raspberrypi cm5. I was able to build this image previously in a cm4 using the main branch, but now is impossible. My problem is with the 07-resize-inti.diff, even if I don't apply any change in the archive, the build fails with the next error:

**[12:09:08] Begin /home/pi/pi-gen/stage2/01-sys-tweaks/00-patches
The quilt meta-data in .pc/ are already in the version 2 format; nothing to do
Applying patch /home/pi/pi-gen/stage2/01-sys-tweaks/00-patches/07-resize-init.diff
patching file rootfs/boot/firmware/cmdline.txt
patch unexpectedly ends in middle of line
patch: **** malformed patch at line 4:

Patch /home/pi/pi-gen/stage2/01-sys-tweaks/00-patches/07-resize-init.diff does not apply (enforce with -f)
[12:09:08] Build failed**

The content of sateg1/00-boot-files/files/cmdline.txt is this:
root=ROOTDEV rootfstype=ext4 fsck.repair=yes rootwait quiet splash loglevel=3 plymouth.ignore-serial-consoles vt.global_cursor_default=0

And the content of the 07-resize-init.diff is the next one:

--- stage2.orig/rootfs/boot/firmware/cmdline.txt
+++ stage2/rootfs/boot/firmware/cmdline.txt
@@ -1 +1 @@
-root=ROOTDEV rootfstype=ext4 fsck.repair=yes rootwait quiet splash loglevel=3 plymouth.ignore-serial-consoles vt.global_cursor_default=0
+root=ROOTDEV rootfstype=ext4 fsck.repair=yes rootwait quiet splash loglevel=3 plymouth.ignore-serial-consoles vt.global_cursor_default=0 init=/usr/lib/raspberrypi-sys-mods/firstboot

I have already checked the whitespaces.

Thank you in advance.

[marvinhinz]

I have the same issue, strange thing is, i pulled master (arm64) and made some minor changes, build worked. Then i accidentally edited the stage1/00-boot-files/files/cmdline.txt directly, after reading #325 i reverted the changes. But now it always fails even when going back to the old commit, seems weird.