btrfs-tools: Add dependency on lzo acl e2fsprog

PATCH In review [email protected] 2 participants 5 messages Aug 26, 2013 – Aug 28, 2013

lore

Share & tools

lore

[email protected]

author

2013-08-26 08:56 UTC #0 lore raw

cover btrfs-tools: Add dependency on lzo acl e2fsprog

From: "Roy.Li" <[email protected]>

The following changes since commit 9b05c65450526522d7358d0c0901b594de546748:

sstate: Fix the relative symlink replacement code (2013-08-23 16:59:04 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib roy/btrfs
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=roy/btrfs

Roy.Li (1):
btrfs-tools: Add dependency on lzo acl e2fsprog

 meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Signature · 1 line

1.7.10.4

[email protected]

author

2013-08-26 08:56 UTC #1 lore raw

PATCH 1/1 btrfs-tools: Add dependency on lzo acl e2fsprog

From: "Roy.Li" <[email protected]>

Signed-off-by Roy.Li <[email protected]>

---
 meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb +1 -1

index 07e8529..3ec9e8a 100644
@@ -10,7 +10,7 @@ HOMEPAGE = "https://btrfs.wiki.kernel.org"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067"
 SECTION = "base"
-DEPENDS = "util-linux attr"
+DEPENDS = "util-linux attr e2fsprogs lzo acl"
 
 SRCREV = "194aa4a1bd6447bb545286d0bcb0b0be8204d79f"
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git;protocol=git"

Signature · 1 line

1.7.10.4

Saul Wold

2013-08-26 14:37 UTC #2 lore raw

Why?

And should the acl be controlled by a PACKAGECONFIG? Can it be disabled during do_configure?

Sau!

Quoted 21 lines · On 08/26/2013 01:56 AM, [email protected] wrote:

From: "Roy.Li" <[email protected]>

Signed-off-by Roy.Li <[email protected]>

---
  meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb +1 -1

index 07e8529..3ec9e8a 100644
@@ -10,7 +10,7 @@ HOMEPAGE = "https://btrfs.wiki.kernel.org"
  LICENSE = "GPLv2"
  LIC_FILES_CHKSUM = "file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067"
  SECTION = "base"
-DEPENDS = "util-linux attr"
+DEPENDS = "util-linux attr e2fsprogs lzo acl"
 
  SRCREV = "194aa4a1bd6447bb545286d0bcb0b0be8204d79f"
  SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git;protocol=git"

Rongqing Li

author

2013-08-27 01:19 UTC #3 lore raw

Quoted 7 lines · Saul Wold

Why?
And should the acl be controlled by a PACKAGECONFIG? Can it be disabled during do_configure?
Sau!

btrfs-tools does not inherit autotools, and does not support the configuration.

it includes <sys/acl.h> hard-code.

The commit which includes <sys/acl.h> is below:

commit 62a72e7d9ada7a986dd299622b2233fe2e386003

Author: Yan <[email protected]>
Date:   Mon Jan 14 13:35:00 2008 -0500

    xattr support for the ext3->btrfs converter

convert.c +6 -5

index beb9a96..c047620 100644
@@ -25,6 +25,7 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/acl.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <uuid/uuid.h>

@@ -35,11 +36,10 @@
 #include "transaction.h"
 #include "crc32c.h"
 #include "utils.h"
-#include "ext2fs/ext2_fs.h"
-#include "ext2fs/ext2fs.h"
-
+#include <ext2fs/ext2_fs.h>
+#include <ext2fs/ext2fs.h>
+#include <ext2fs/ext2_ext_attr.h>
 #define INO_OFFSET (BTRFS_FIRST_FREE_OBJECTID - EXT2_ROOT_INO)
-
 /*
  * Open Ext2fs in readonly mode, read block allocation bitmap and
  * inode bitmap into memory.

@@ -446,7 +446,8 @@ static int __block_iterate_proc(ext2_filsys fs, blk_t *blocknr,
 static int create_file_extents(struct btrfs_trans_handle *trans,
                               struct btrfs_root *root, u64 objectid,
                               struct btrfs_inode_item *btrfs_inode,
-                              ext2_filsys ext2_fs, ext2_ino_t ext2_ino)
+                              ext2_filsys ext2_fs, ext2_ino_t ext2_ino,
+                              int datacsum, int packing)

The btrfs-convert.c which include <sys/acl.h> is below:

* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 021110-1307, USA.
*/

#define _XOPEN_SOURCE 600
#define _GNU_SOURCE 1

#include "kerncompat.h"

#ifndef __CHECKER__
#include <sys/ioctl.h>
#include <sys/mount.h>
#endif
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/acl.h>

both are hard-code.

-Roy

Quoted 29 lines · On 08/26/2013 01:56 AM, [email protected] wrote:

Quoted 25 lines
From: "Roy.Li" <[email protected]>
Signed-off-by Roy.Li <[email protected]>
---
  meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb +0 -0
index 07e8529..3ec9e8a 100644
@@ -10,7 +10,7 @@ HOMEPAGE = "https://btrfs.wiki.kernel.org"
  LICENSE = "GPLv2"
  LIC_FILES_CHKSUM =
"file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067"
SECTION = "base"
meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb +1 -1
-DEPENDS = "util-linux attr"
+DEPENDS = "util-linux attr e2fsprogs lzo acl"
 
  SRCREV = "194aa4a1bd6447bb545286d0bcb0b0be8204d79f"
  SRC_URI =
"git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git;protocol=git"

Signature · 2 lines

Best Reagrds,
Roy | RongQing Li

Saul Wold

2013-08-28 00:34 UTC #4 lore raw

Quoted 6 lines · Rongqing Li

Quoted 3 lines · Saul Wold
Why?

Still need give a better commit message about why these depends are needed.

Sau!

Quoted 126 lines

Quoted 4 lines
And should the acl be controlled by a PACKAGECONFIG? Can it be disabled during do_configure?
Sau!
btrfs-tools does not inherit autotools, and does not support the configuration.
it includes <sys/acl.h> hard-code.
The commit which includes <sys/acl.h> is below:
commit 62a72e7d9ada7a986dd299622b2233fe2e386003
Author: Yan <[email protected]>
Date:   Mon Jan 14 13:35:00 2008 -0500
     xattr support for the ext3->btrfs converter
convert.c +6 -5
index beb9a96..c047620 100644
@@ -25,6 +25,7 @@
  #include <stdlib.h>
  #include <sys/types.h>
  #include <sys/stat.h>
+#include <sys/acl.h>
  #include <fcntl.h>
  #include <unistd.h>
  #include <uuid/uuid.h>
@@ -35,11 +36,10 @@
  #include "transaction.h"
  #include "crc32c.h"
  #include "utils.h"
-#include "ext2fs/ext2_fs.h"
-#include "ext2fs/ext2fs.h"
-
+#include <ext2fs/ext2_fs.h>
+#include <ext2fs/ext2fs.h>
+#include <ext2fs/ext2_ext_attr.h>
  #define INO_OFFSET (BTRFS_FIRST_FREE_OBJECTID - EXT2_ROOT_INO)
-
  /*
   * Open Ext2fs in readonly mode, read block allocation bitmap and
   * inode bitmap into memory.
@@ -446,7 +446,8 @@ static int __block_iterate_proc(ext2_filsys fs,
 blk_t *blocknr,
  static int create_file_extents(struct btrfs_trans_handle *trans,
                                struct btrfs_root *root, u64 objectid,
                                struct btrfs_inode_item *btrfs_inode,
-                              ext2_filsys ext2_fs, ext2_ino_t ext2_ino)
+                              ext2_filsys ext2_fs, ext2_ino_t ext2_ino,
+                              int datacsum, int packing)
 
 
The btrfs-convert.c which include <sys/acl.h> is below:
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 021110-1307, USA.
*/
#define _XOPEN_SOURCE 600
#define _GNU_SOURCE 1
#include "kerncompat.h"
#ifndef __CHECKER__
#include <sys/ioctl.h>
#include <sys/mount.h>
#endif
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/acl.h>
both are hard-code.
-Roy
Quoted 30 lines · On 08/26/2013 01:56 AM, [email protected] wrote:
Quoted 26 lines
From: "Roy.Li" <[email protected]>
Signed-off-by Roy.Li <[email protected]>
---
  meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb +0 -0
index 07e8529..3ec9e8a 100644
@@ -10,7 +10,7 @@ HOMEPAGE = "https://btrfs.wiki.kernel.org"
  LICENSE = "GPLv2"
  LIC_FILES_CHKSUM =
"file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067"
SECTION = "base"
meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb +1 -1
-DEPENDS = "util-linux attr"
+DEPENDS = "util-linux attr e2fsprogs lzo acl"
 
  SRCREV = "194aa4a1bd6447bb545286d0bcb0b0be8204d79f"
  SRC_URI =
"git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git;protocol=git"