git-am: "Patch fragment without a header"
git-am from git-1.1.6 refuses to apply the following two patches, whereas patch(1) sees nothing wrong with them...
The error messages look like:
: smyrno 46 ; git-am /tmp/\[klibc]\ Add\ swap\ support\ to\ fstype,\ second\ version.eml
Applying 'Add swap support to fstype, second version'
error: patch fragment without header at line 4: @@ -7,7 +7,7 @@
error: patch fragment without header at line 13: @@ -20,6 +20,7 @@
error: patch fragment without header at line 21: @@ -49,6 +50,9 @@
error: patch fragment without header at line 31: @@ -182,6 +186,19 @@
error: patch fragment without header at line 50: @@ -189,17 +206,18 @@
error: patch fragment without header at line 83: @@ -0,0 +1,18 @@
fatal: No changes
Patch failed at 0001.
The patches are meant to be apply to the top of:
git://git.kernel.org/pub/scm/libs/klibc/klibc.git
HEAD = ea6af2b08cb18ba60e55c5e8f0f65ddac1672ca0
-hpa
The attached patch adds support for detecting LUKS partitions (Linux Unified Key Setup - http://luks.endorphin.org/) to fstype. This makes it easier to automatically detect and activate encrypted (root) partitions from an initramfs image.
The patch is now against klibc's git tree instead of klibc-1.2.
--
fstype.c | 17 ++++++++++++++++- luks_fs.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 1 deletion(-)
usr/kinit/fstype/fstype.c +16 -1
@@ -7,7 +7,7 @@* FSSIZE - filesystem size (if known) * * We currently detect (in order): -* gzip, cramfs, romfs, xfs, minix, ext3, ext2, reiserfs, jfs +* gzip, cramfs, romfs, xfs, luks, minix, ext3, ext2, reiserfs, jfs * * MINIX, ext3 and Reiserfs bits are currently untested. */
@@ -29,6 +29,7 @@#include "ext2_fs.h" #include "ext3_fs.h" #include "xfs_sb.h" +#include "luks_fs.h" /* * Slightly cleaned up version of jfs_superblock to
@@ -168,6 +169,19 @@return 0 ; } +static int luks_image (const unsigned char *buf,unsigned long long *blocks) +{ +const struct luks_partition_header *lph = + (const struct luks_partition_header *)buf; + +if (!memcmp (lph->magic,LUKS_MAGIC ,LUKS_MAGIC_L )) { +/* FSSIZE is dictated by the underlying fs, not by LUKS */ + *blocks =0 ; +return 1 ; + } +return 0 ; +} +struct imagetype {off_t block;const char name[12 ];
@@ -179,6 +193,7 @@ { 0, "cramfs", cramfs_image }, { 0, "romfs", romfs_image }, { 0, "xfs", xfs_image }, + { 0, "luks", luks_image }, { 1, "minix", minix_image }, { 1, "ext3", ext3_image }, { 1, "ext2", ext2_image },
usr/kinit/fstype/luks_fs.h new file +45 -0
45 lines not on this page · raw message
_______________________________________________
klibc mailing list
[email protected]
http://www.zytor.com/mailman/listinfo/klibc
This patch adds support for swap detection to fstype (to be applied on top of the previous luks patch).
The patch is now against klibc's git tree instead of klibc-1.2.
Signature · 3 lines
fstype.c | 42 ++++++++++++++++++++++++++++++------------ swap_fs.h | 18 ++++++++++++++++++ 2 files changed, 48 insertions(+), 12 deletions(-)
usr/kinit/fstype/fstype.c +30 -12
72 lines not on this page · raw message
usr/kinit/fstype/swap_fs.h new file +18 -0
@@ -0,0 +1,18 @@ +#ifndef __LINUX_SWAP_FS_H +#define __LINUX_SWAP_FS_H + +/* The basic structures of the swap super block */ +#define SWAP_RESERVED_L BLOCK_SIZE - 10 +#define SWAP_MAGIC_L 10 +#define SWAP_MAGIC_1 "SWAP-SPACE" +#define SWAP_MAGIC_2 "SWAPSPACE2" +/* The super block is the last block in the first page */ +#define SWAP_OFFSET ((PAGE_SIZE - BLOCK_SIZE) / BLOCK_SIZE) + +/* On-disk "super block" */ +struct swap_super_block { +char reserved[SWAP_RESERVED_L ]; +char magic[SWAP_MAGIC_L ]; +}; + +#endif
_______________________________________________
klibc mailing list
[email protected]
http://www.zytor.com/mailman/listinfo/klibc
Quoted 2 lines · H. Peter Anvin
git-am from git-1.1.6 refuses to apply the following two patches, whereas patch(1) sees nothing wrong with them...
Linus would have said "Say No to MIME". I am a bit too busy right now so if you are inclined to take a look, the problem is in mailinfo.
It tries to do a limited form of MIME and fails. The problem is that it does not handle different content transfer encodings used in the same message. The first part of the multipart (log message) does this:
Content-Type: text/plain; charset=iso-8859-1; format=flowed
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
and it then switches to:
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline; filename=klibc-add-luks-to-fstype-v2
Index: klibc/usr/kinit/fstype/fstype.c
===================================================================
--- .....
in the second part. The mailinfo splits them alright but it still thinks it needs to help with quoted printable, and ends up eating these ===== marks and spitting out garbage.
Quoted 5 lines · Junio C Hamano
Linus would have said "Say No to MIME". I am a bit too busy right now so if you are inclined to take a look, the problem is in mailinfo.
Unfortunately git-mailinfo is in C, otherwise I'd have suggested using the Perl MIME-tools, which seems to have all this stuff in it.
It might just be easier to try to rewrite git-mailinfo in Perl...
-hpa
Quoted 2 lines · H. Peter Anvin
Unfortunately git-mailinfo is in C, otherwise I'd have suggested using the Perl MIME-tools, which seems to have all this stuff in it.
Heh, spawn Perl for every message? I'd be ****ed by Linus if I did so ;-).
This should fix it and I'd appreciate if you try it on other messages.
I tried it on the message you quoted with:
git-mailinfo -u /var/tmp/msg /var/tmp/patch <./+hpa.eml >/var/tmp/info
The resulting 'msg' and 'info' looks reasonable utf8 and patch was not corrupt.
-- >8 --
[PATCH] mailinfo: reset CTE after each multipart
If the first part uses quoted-printable to protect iso8859-1 name in the commit log, and the second part was plain ascii text patchfile without even Content-Transfer-Encoding subheader, we incorrectly tried to decode the patch as quoted printable.
---
mailinfo.c +3 -0
@@ -707,6 +707,9 @@ static void handle_multipart_body(void)if (!len) {if (handle_multipart_one_part () <0 )return ; +/* Reset per part headers */ + transfer_encoding =TE_DONTCARE ; + charset[0 ] =0 ; }else check_subheader_line (line, len);
Quoted 5 lines · H. Peter Anvin
Unfortunately git-mailinfo is in C, otherwise I'd have suggested using the Perl MIME-tools, which seems to have all this stuff in it.
It might just be easier to try to rewrite git-mailinfo in Perl...
It might just be easier to make the mime checking go the hell away.
I do _not_ want to see some random perl code for the stuff I use (hundreds of times) a day. I can apply 5 patches a second right now, and more importantly, I know what it does.
Partly because I always edit out the stupid MIME stuff. I think it was a mistake to accept MIME patches in the first place.
Linus