CaROS/meta-selinux
3
0
Fork 0
mirror of git://git.yoctoproject.org/meta-selinux synced 2026-01-01 13:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

e2fsprogs: Insert calls to xattr module into mke2fs and build xattr code.

Browse Source 
Signed-off-by: Philip Tricca <flihp@twobit.us>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
Philip Tricca 2015-06-17 15:30:54 -07:00 committed by Joe MacDonald
parent 6319e568d0
commit e9b28794f1
2 changed files with 165 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

164
recipes-devtools/e2fsprogs/e2fsprogs/mke2fs.c-create_inode.c-copy-xattrs.patch Normal file
View File

@ -0,0 +1,164 @@
Insert calls into xattr module to copy xattrs for each file system object
copied by mke2fs when '-d' is specified. This requires a call to
set_inode_xattr in two places:
misc/create_inode.c: to copy xattrs as part of the recursive traversal
of the source directory
misc/mke2fs.c: to copy the xattr block associated with the root of the
file system
Insert a call to xattr_cleanup to free any resources that need special
handling in the xattr module.
We also add the necessary rules to Makefile.in to build the xattr module
and link it into executables as required.
Signed-off-by: Philip Tricca <flihp@twobit.us>
Index: e2fsprogs-1.42.9/misc/mke2fs.c
===================================================================
--- e2fsprogs-1.42.9.orig/misc/mke2fs.c
+++ e2fsprogs-1.42.9/misc/mke2fs.c
@@ -56,6 +56,7 @@ extern int optind;
#include "../version.h"
#include "quota/mkquota.h"
#include "create_inode.h"
+#include "xattr.h"
#define STRIDE_LENGTH 8
@@ -2744,6 +2745,11 @@ no_journal:
hdlinks.count = 0;
current_fs = fs;
root = EXT2_ROOT_INO;
+ retval = set_inode_xattr (fs, EXT2_ROOT_INO, root_dir);
+ if (retval) {
+ fprintf(stderr, "%s", _("Error setting xattr for inode: 0x%x\n"), EXT2_ROOT_INO);
+ return retval;
+ }
retval = populate_fs(root, root_dir);
if (retval) {
fprintf(stderr, "%s",
@@ -2751,6 +2757,7 @@ no_journal:
return retval;
} else if (!quiet)
printf("%s", _("done\n"));
+ xattr_cleanup();
}
if (!quiet)
Index: e2fsprogs-1.42.9/misc/create_inode.c
===================================================================
--- e2fsprogs-1.42.9.orig/misc/create_inode.c
+++ e2fsprogs-1.42.9/misc/create_inode.c
@@ -1,5 +1,6 @@
#include "create_inode.h"
#include <limits.h>
+#include "xattr.h"
#if __STDC_VERSION__ < 199901L
# if __GNUC__ >= 2
@@ -549,6 +550,12 @@ errcode_t populate_fs(ext2_ino_t parent_
return retval;
}
+ if ((retval = set_inode_xattr (current_fs, ino, name))) {
+ com_err(__func__, retval,
+ _("while setting xattrs for \"%s\""), name);
+ return retval;
+ }
+
/* Save the hardlink ino */
if (save_inode) {
/*
Index: e2fsprogs-1.42.9/debugfs/Makefile.in
===================================================================
--- e2fsprogs-1.42.9.orig/debugfs/Makefile.in
+++ e2fsprogs-1.42.9/debugfs/Makefile.in
@@ -18,7 +18,7 @@ MK_CMDS= _SS_DIR_OVERRIDE=../lib/ss ../l
DEBUG_OBJS= debug_cmds.o debugfs.o util.o ncheck.o icheck.o ls.o \
lsdel.o dump.o set_fields.o logdump.o htree.o unused.o e2freefrag.o \
- filefrag.o extent_cmds.o extent_inode.o zap.o create_inode.o
+ filefrag.o extent_cmds.o extent_inode.o zap.o create_inode.o xattr.o
RO_DEBUG_OBJS= ro_debug_cmds.o ro_debugfs.o util.o ncheck.o icheck.o ls.o \
lsdel.o logdump.o htree.o e2freefrag.o filefrag.o extent_cmds.o \
@@ -29,12 +29,16 @@ SRCS= debug_cmds.c $(srcdir)/debugfs.c $
$(srcdir)/dump.c $(srcdir)/set_fields.c ${srcdir}/logdump.c \
$(srcdir)/htree.c $(srcdir)/unused.c ${srcdir}/../misc/e2freefrag.c \
$(srcdir)/filefrag.c $(srcdir)/extent_inode.c $(srcdir)/zap.c \
- $(srcdir)/../misc/create_inode.c
+ $(srcdir)/../misc/create_inode.c $(srcdir)/../misc/xattr.c
CREATE_INODE_DEPS= $(srcdir)/../misc/create_inode.h \
$(srcdir)/../misc/create_inode.c $(top_builddir)/lib/config.h \
$(srcdir)/../lib/ext2fs/ext2fs.h $(srcdir)/../lib/et/com_err.h \
- $(srcdir)/../lib/e2p/e2p.h $(srcdir)/../misc/nls-enable.h
+ $(srcdir)/../lib/e2p/e2p.h $(srcdir)/../misc/nls-enable.h \
+ $(srcdir)/../misc/xattr.h
+
+XATTR_DEPS= $(srcdir)/../misc/xattr.h $(srcdir)/../misc/xattr.h \
+ $(srcdir)/../lib/et/com_err.h $(srcdir)/../lib/ext2fs/ext2fs.h
LIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(LIBBLKID) \
$(LIBUUID)
@@ -92,6 +96,11 @@ create_inode.o: $(CREATE_INODE_DEPS)
$(Q) $(CC) -c $(ALL_CFLAGS) -I$(srcdir) \
$(srcdir)/../misc/create_inode.c -DDEBUGFS -o $@
+xattr.o: $(XATTR_DEPS)
+ $(E) " CC $@"
+ $(Q) $(CC) -c $(ALL_CFLAGS) -I$(srcdir) \
+ $(srcdir)/../misc/xattr.c -o $@
+
debugfs.8: $(DEP_SUBSTITUTE) $(srcdir)/debugfs.8.in
$(E) " SUBST $@"
$(Q) $(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8
Index: e2fsprogs-1.42.9/misc/Makefile.in
===================================================================
--- e2fsprogs-1.42.9.orig/misc/Makefile.in
+++ e2fsprogs-1.42.9/misc/Makefile.in
@@ -43,7 +43,7 @@ LPROGS= @E2INITRD_PROG@
TUNE2FS_OBJS= tune2fs.o util.o
MKLPF_OBJS= mklost+found.o
MKE2FS_OBJS= mke2fs.o util.o profile.o prof_err.o default_profile.o \
- create_inode.o
+ create_inode.o xattr.o
CHATTR_OBJS= chattr.o
LSATTR_OBJS= lsattr.o
UUIDGEN_OBJS= uuidgen.o
@@ -62,7 +62,7 @@ PROFILED_TUNE2FS_OBJS= profiled/tune2fs.
PROFILED_MKLPF_OBJS= profiled/mklost+found.o
PROFILED_MKE2FS_OBJS= profiled/mke2fs.o profiled/util.o profiled/profile.o \
profiled/prof_err.o profiled/default_profile.o \
- profiled/create_inode.o
+ profiled/create_inode.o profiled/xattr.o
PROFILED_CHATTR_OBJS= profiled/chattr.o
PROFILED_LSATTR_OBJS= profiled/lsattr.o
PROFILED_UUIDGEN_OBJS= profiled/uuidgen.o
@@ -84,7 +84,8 @@ SRCS= $(srcdir)/tune2fs.c $(srcdir)/mklo
$(srcdir)/uuidgen.c $(srcdir)/blkid.c $(srcdir)/logsave.c \
$(srcdir)/filefrag.c $(srcdir)/base_device.c \
$(srcdir)/ismounted.c $(srcdir)/../e2fsck/profile.c \
- $(srcdir)/e2undo.c $(srcdir)/e2freefrag.c $(srcdir)/create_inode.c
+ $(srcdir)/e2undo.c $(srcdir)/e2freefrag.c $(srcdir)/create_inode.c \
+ $(srcdir)/xattr.c
LIBS= $(LIBEXT2FS) $(LIBCOM_ERR)
DEPLIBS= $(LIBEXT2FS) $(DEPLIBCOM_ERR)
@@ -634,7 +635,8 @@ mke2fs.o: $(srcdir)/mke2fs.c $(top_build
$(srcdir)/util.h profile.h prof_err.h $(top_srcdir)/version.h \
$(srcdir)/nls-enable.h $(top_srcdir)/lib/quota/mkquota.h $(srcdir)/create_inode.h\
$(top_srcdir)/lib/quota/quotaio.h $(top_srcdir)/lib/quota/dqblk_v2.h \
- $(top_srcdir)/lib/quota/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h
+ $(top_srcdir)/lib/quota/quotaio_tree.h $(top_srcdir)/lib/../e2fsck/dict.h \
+ $(srcdir)/xattr.h
chattr.o: $(srcdir)/chattr.c $(top_builddir)/lib/config.h \
$(top_builddir)/lib/dirpaths.h $(top_srcdir)/lib/ext2fs/ext2_fs.h \
$(top_builddir)/lib/ext2fs/ext2_types.h $(top_srcdir)/lib/et/com_err.h \
@@ -716,3 +718,5 @@ create_inode.o: $(srcdir)/create_inode.h
$(top_builddir)/lib/config.h $(top_srcdir)/lib/ext2fs/ext2fs.h \
$(top_srcdir)/lib/et/com_err.h $(top_srcdir)/lib/e2p/e2p.h \
$(srcdir)/nls-enable.h
+xattr.o: $(srcdir)/xattr.h $(srcdir)/xattr.c \
+ $(top_builddir)/lib/et/com_err.h $(top_srcdir)/lib/ext2fs/ext2fs.h

1
recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bbappend
View File

@ -2,4 +2,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
SRC_URI += " \
file://misc-xattr-add-xattr-module-stub.patch \
file://mke2fs.c-create_inode.c-copy-xattrs.patch \
"