[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
23/24: gnu: hurd: Update to upstream Hurd-reserved xattr index.
From: |
guix-commits |
Subject: |
23/24: gnu: hurd: Update to upstream Hurd-reserved xattr index. |
Date: |
Sun, 17 May 2020 06:00:56 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit ea23f0be907b28122115d5780eae1185029ad400
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Tue May 12 07:56:46 2020 +0200
gnu: hurd: Update to upstream Hurd-reserved xattr index.
This enables setting (and reading) passive translators when preparing a Hurd
file system from GNU/Linux.
* gnu/packages/patches/hurd-xattr.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/hurd.scm (hurd): Use it.
---
gnu/local.mk | 1 +
gnu/packages/hurd.scm | 3 +-
gnu/packages/patches/hurd-xattr.patch | 53 +++++++++++++++++++++++++++++++++++
3 files changed, 56 insertions(+), 1 deletion(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 902e44e..b9c59b8 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1083,6 +1083,7 @@ dist_patch_DATA =
\
%D%/packages/patches/hdf-eos5-fortrantests.patch \
%D%/packages/patches/hubbub-sort-entities.patch \
%D%/packages/patches/hurd-cross.patch \
+ %D%/packages/patches/hurd-xattr.patch \
%D%/packages/patches/hplip-remove-imageprocessor.patch \
%D%/packages/patches/hydra-disable-darcs-test.patch \
%D%/packages/patches/icecat-makeicecat.patch \
diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm
index 6f77499..9f3e945 100644
--- a/gnu/packages/hurd.scm
+++ b/gnu/packages/hurd.scm
@@ -431,7 +431,8 @@ boot, since this cannot be done from GNU/Linux."
(name "hurd")
(version (package-version hurd-headers))
(source (origin (inherit (package-source hurd-headers))
- (patches (search-patches "hurd-cross.patch"))))
+ (patches (search-patches "hurd-cross.patch"
+ "hurd-xattr.patch"))))
(arguments
`(#:phases
(modify-phases %standard-phases
diff --git a/gnu/packages/patches/hurd-xattr.patch
b/gnu/packages/patches/hurd-xattr.patch
new file mode 100644
index 0000000..0a922c9
--- /dev/null
+++ b/gnu/packages/patches/hurd-xattr.patch
@@ -0,0 +1,53 @@
+From 75cb948c575fca3962c4cce115d31dd178bc389f Mon Sep 17 00:00:00 2001
+From: "Jan (janneke) Nieuwenhuizen" <address@hidden>
+Date: Tue, 12 May 2020 07:39:59 +0200
+Subject: [PATCH] ext2fs: Update to upstream Hurd-reserved xattr index for
+ "gnu.*".
+
+See
+
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3980bd3b406addb327d858aebd19e229ea340b9a
+
+This supports setting (and reading) of passive trasnlators from
+GNU/Linux, e.g.
+
+ dd if=/dev/zero of=file bs=1k count=1000
+ losetup /dev/loop0 file
+ mke2fs -t ext2 -o hurd -O ext_attr /dev/loop0
+ mount -t ext2 -o x-xattr-translator-records /dev/loop0 /mnt
+ mkdir -p /mnt/servers/socket
+ touch /mnt/servers/socket/1
+ setfattr --name=gnu.translator --value='/hurd/pflocal\0'
/mnt/servers/socket/1
+ getfattr --name=gnu.translator /mnt/servers/socket/1
+ # file: 1
+ gnu.translator="/hurd/pflocal"
+
+* ext2fs/xattr.c (struct _xattr_prefix): For "gnu.*", use index for
+the Hurd (10).
+---
+ ext2fs/xattr.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ext2fs/xattr.c b/ext2fs/xattr.c
+index f6ea0f39..78458214 100644
+--- a/ext2fs/xattr.c
++++ b/ext2fs/xattr.c
+@@ -1,6 +1,6 @@
+ /* Ext2 support for extended attributes
+
+- Copyright (C) 2006, 2016 Free Software Foundation, Inc.
++ Copyright (C) 2006, 2016, 2020 Free Software Foundation, Inc.
+
+ Written by Thadeu Lima de Souza Cascardo <address@hidden>
+ and Shengyu Zhang <address@hidden>
+@@ -39,7 +39,7 @@ xattr_prefixes[] =
+ {
+ 1, "user.", sizeof "user." - 1},
+ {
+- 7, "gnu.", sizeof "gnu." - 1},
++ 10, "gnu.", sizeof "gnu." - 1},
+ {
+ 0, NULL, 0}
+ };
+--
+2.26.0
+
- 09/24: bootloader: grub: Add support for '<hurd-menu-entry>'., (continued)
- 09/24: bootloader: grub: Add support for '<hurd-menu-entry>'., guix-commits, 2020/05/17
- 13/24: services: hurd: Add `hurd-etc-service'., guix-commits, 2020/05/17
- 12/24: system: examples: Add bare-hurd.tmpl., guix-commits, 2020/05/17
- 14/24: system: Add `hurd-activation'., guix-commits, 2020/05/17
- 17/24: services: Add `hurd-console-service-type'., guix-commits, 2020/05/17
- 18/24: services: Add `hurd-getty-service-type'., guix-commits, 2020/05/17
- 19/24: system: hurd: Populate services., guix-commits, 2020/05/17
- 20/24: DRAFT: system: vm: Activate the Hurd., guix-commits, 2020/05/17
- 21/24: system: bare-hurd.tmpl: Add openssh client and service., guix-commits, 2020/05/17
- 22/24: gnu: linux-libre: Add support for gnu.* namespace., guix-commits, 2020/05/17
- 23/24: gnu: hurd: Update to upstream Hurd-reserved xattr index.,
guix-commits <=
- 06/24: system: Add 'hurd' field to <operating-system>., guix-commits, 2020/05/17
- 04/24: system: vm: Add defaults for the Hurd., guix-commits, 2020/05/17
- 10/24: system: vm: Initial vm-image support for the Hurd., guix-commits, 2020/05/17
- 15/24: services: hurd: Use activation-service, hurd-etc-service., guix-commits, 2020/05/17
- 24/24: system: hurd: Remove bash from boot process., guix-commits, 2020/05/17