diff options
| author | Carsten Haitzler <raster@openmoko.org> | 2009-04-14 20:18:10 +1000 |
|---|---|---|
| committer | Carsten Haitzler <raster@openmoko.org> | 2009-04-14 23:25:14 +1000 |
| commit | b7f7293617199f0f14064d0add50b8882d8a4ffb (patch) | |
| tree | 7fa20dc9847c4f473dbb1274b2760ebeff8f0031 | |
| parent | 54aad17440d90a18e1f5ee7e4e8127253fb8e660 (diff) | |
e2fsprogs: fix compile to use 3 args so it works.
| -rw-r--r-- | recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch | 11 | ||||
| -rw-r--r-- | recipes/e2fsprogs/e2fsprogs-native_1.38.bb | 5 | ||||
| -rw-r--r-- | recipes/e2fsprogs/e2fsprogs_1.38.bb | 5 |
3 files changed, 17 insertions, 4 deletions
diff --git a/recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch b/recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch new file mode 100644 index 0000000000..97679d6ff9 --- /dev/null +++ b/recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch @@ -0,0 +1,11 @@ +--- e2fsprogs-1.38/lib/ext2fs/ismounted.c~ 2005-06-06 06:05:22.000000000 +1000 ++++ e2fsprogs-1.38/lib/ext2fs/ismounted.c 2009-04-03 15:07:35.000000000 +1100 +@@ -147,7 +147,7 @@ + is_root: + #define TEST_FILE "/.ismount-test-file" + *mount_flags |= EXT2_MF_ISROOT; +- fd = open(TEST_FILE, O_RDWR|O_CREAT); ++ fd = open(TEST_FILE, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR); + if (fd < 0) { + if (errno == EROFS) + *mount_flags |= EXT2_MF_READONLY; diff --git a/recipes/e2fsprogs/e2fsprogs-native_1.38.bb b/recipes/e2fsprogs/e2fsprogs-native_1.38.bb index 388c519d0c..af49b0d7dd 100644 --- a/recipes/e2fsprogs/e2fsprogs-native_1.38.bb +++ b/recipes/e2fsprogs/e2fsprogs-native_1.38.bb @@ -2,11 +2,12 @@ SECTION = "base" require e2fsprogs.inc inherit native -PR = "r2" +PR = "r3" SRC_URI += "file://no-hardlinks.patch;patch=1 \ file://mkinstalldirs.patch;patch=1 \ - " + file://file-open-mode.patch;patch=1 \ + " EXTRA_OECONF = "" diff --git a/recipes/e2fsprogs/e2fsprogs_1.38.bb b/recipes/e2fsprogs/e2fsprogs_1.38.bb index 5687556c78..8ec469a84a 100644 --- a/recipes/e2fsprogs/e2fsprogs_1.38.bb +++ b/recipes/e2fsprogs/e2fsprogs_1.38.bb @@ -1,10 +1,11 @@ require e2fsprogs.inc -PR = "r19" +PR = "r20" SRC_URI += "file://no-hardlinks.patch;patch=1 \ file://mkinstalldirs.patch;patch=1 \ - " + file://file-open-mode.patch;patch=1 \ + " TARGET_CC_ARCH += "${LDFLAGS}" |