Re: [oe] patchwork, please keep patches up to date
Dear OE folks, Am Donnerstag, den 05.08.2010, 21:30 +0200 schrieb Koen Kooi: […] I had a look around patchwork and I noticed lots of duplicates and already applied patches are still in the queue, so I have a small request: Could the people sending patches to this mailinglist update their status in patchwork? And can people applying patches also update the status? there is also `pwclient` for the command line. Please take a look at the Wiki page [1] for more information. By the way, there are some examples in the Patchwork repository for post commit hooks to mark those patches automatically as applied. (Since the Patchwork repository is not browsable take a look at [2] for example.) Thanks, Paul [1] http://wiki.openembedded.net/index.php?title=Patchwork [2] http://lists.ozlabs.org/pipermail/patchwork/2010-February/000224.html signature.asc Description: This is a digitally signed message part ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH v2 1/2] recipe for gsnmp-0.3.0
2010/8/5 Frans Meulenbroeks fransmeulenbro...@gmail.com: This one also failed building with a similar QA issue: NOTE: Running task 629 of 630 (ID: 10, /home/frans/oe/openembedded/recipes/gsnmp/gsnmp_0.3.0.bb, do_qa_staging) ERROR: QA Issue with staging: libexslt.pc failed sanity test (tmpdir) in path /home/frans/oe/tmp_angstrom/sysroots/armv7a-angstrom-linux-gnueabi/usr/lib/pkgconfig ERROR: QA Issue with staging: libxslt.pc failed sanity test (tmpdir) in path /home/frans/oe/tmp_angstrom/sysroots/armv7a-angstrom-linux-gnueabi/usr/lib/pkgconfig ERROR: QA staging was broken by the package built above see http://tinderbox.openembedded.net/builds/81312 No idea how exactly to fix this. Frans Please disregard ths comment and the one on the other recipe. Apparently some other recipe (libxslt) left a faulty pc file in pkgconfig. That is something that needs to be repaired (although I woudl not know how), but does not affect your recipe. Your recipes have been tested, build nicely and have been pushed. Thank you for your contribution, and again apologies for any inconvenience caused by the above mail) Frans ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [PATCH 2/4] e2fsprogs: add 1.41.12, remove old versions
Signed-off-by: Bernhard Reutner-Fischer rep.dot@gmail.com
---
.../e2fsprogs/e2fsprogs-1.38/file-open-mode.patch | 11 -
.../e2fsprogs/e2fsprogs-1.38/mkinstalldirs.patch | 273
.../e2fsprogs/e2fsprogs-1.38/no-hardlinks.patch| 82 --
recipes/e2fsprogs/e2fsprogs_1.38.bb| 13 -
recipes/e2fsprogs/e2fsprogs_1.41.12.bb | 10 +
recipes/e2fsprogs/e2fsprogs_1.41.4.bb |8 -
recipes/e2fsprogs/e2fsprogs_1.41.5.bb |8 -
recipes/e2fsprogs/e2fsprogs_1.41.9.bb | 10 -
8 files changed, 10 insertions(+), 405 deletions(-)
delete mode 100644 recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch
delete mode 100644 recipes/e2fsprogs/e2fsprogs-1.38/mkinstalldirs.patch
delete mode 100644 recipes/e2fsprogs/e2fsprogs-1.38/no-hardlinks.patch
delete mode 100644 recipes/e2fsprogs/e2fsprogs_1.38.bb
create mode 100644 recipes/e2fsprogs/e2fsprogs_1.41.12.bb
delete mode 100644 recipes/e2fsprogs/e2fsprogs_1.41.4.bb
delete mode 100644 recipes/e2fsprogs/e2fsprogs_1.41.5.bb
delete mode 100644 recipes/e2fsprogs/e2fsprogs_1.41.9.bb
diff --git a/recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch
b/recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch
deleted file mode 100644
index 97679d6..000
--- a/recipes/e2fsprogs/e2fsprogs-1.38/file-open-mode.patch
+++ /dev/null
@@ -1,11 +0,0 @@
e2fsprogs-1.38/lib/ext2fs/ismounted.c~ 2005-06-06 06:05:22.0
+1000
-+++ e2fsprogs-1.38/lib/ext2fs/ismounted.c 2009-04-03 15:07:35.0
+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-1.38/mkinstalldirs.patch
b/recipes/e2fsprogs/e2fsprogs-1.38/mkinstalldirs.patch
deleted file mode 100644
index d1dbd07..000
--- a/recipes/e2fsprogs/e2fsprogs-1.38/mkinstalldirs.patch
+++ /dev/null
@@ -1,273 +0,0 @@
-This patch is based on the following:
-
-http://cvs.fedora.redhat.com/viewvc/rpms/e2fsprogs/F-7/e2fsprogs-1.39-mkinstalldirs.patch
-
-diff -urN e2fsprogs-1.38.orig/configure.in e2fsprogs-1.38/configure.in
e2fsprogs-1.38.orig/configure.in 2005-04-06 20:44:15.0 +0200
-+++ e2fsprogs-1.38/configure.in2008-10-16 23:44:10.0 +0200
-@@ -518,6 +518,7 @@
- AC_CHECK_TOOL(RANLIB, ranlib, :)
- AC_CHECK_TOOL(STRIP, strip, :)
- AC_PROG_INSTALL
-+AC_PROG_MKDIR_P
- # See if we need a separate native compiler.
- if test $cross_compiling = no; then
- BUILD_CC=$CC
-diff -urN e2fsprogs-1.38.orig/debugfs/Makefile.in
e2fsprogs-1.38/debugfs/Makefile.in
e2fsprogs-1.38.orig/debugfs/Makefile.in2005-06-29 19:42:20.0
+0200
-+++ e2fsprogs-1.38/debugfs/Makefile.in 2008-10-16 23:44:10.0 +0200
-@@ -48,8 +48,8 @@
- @$(SUBSTITUTE_UPTIME) $(srcdir)/debugfs.8.in debugfs.8
-
- installdirs:
-- @echo MKINSTALLDIRS $(root_sbindir) $(man8dir)
-- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
-+ @echo MKDIR_P $(root_sbindir) $(man8dir)
-+ @$(MKDIR_P) $(DESTDIR)$(root_sbindir) \
- $(DESTDIR)$(man8dir)
-
- install: $(PROGS) $(MANPAGES) installdirs
-diff -urN e2fsprogs-1.38.orig/doc/Makefile.in e2fsprogs-1.38/doc/Makefile.in
e2fsprogs-1.38.orig/doc/Makefile.in2005-06-29 19:42:20.0
+0200
-+++ e2fsprogs-1.38/doc/Makefile.in 2008-10-16 23:44:10.0 +0200
-@@ -20,8 +20,8 @@
-
- install-doc-libs:
- @$(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
-- @echo MKINSTALLDIRS $(infodir)
-- @$(MKINSTALLDIRS) $(DESTDIR)$(infodir)
-+ @echo MKDIR_P $(infodir)
-+ @$(MKDIR_P) $(DESTDIR)$(infodir)
- @for i in libext2fs.info* ; do \
- echo INSTALL_DATA $(infodir)/$$i ; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
-diff -urN e2fsprogs-1.38.orig/e2fsck/Makefile.in
e2fsprogs-1.38/e2fsck/Makefile.in
e2fsprogs-1.38.orig/e2fsck/Makefile.in 2005-06-29 19:42:20.0
+0200
-+++ e2fsprogs-1.38/e2fsck/Makefile.in 2008-10-16 23:44:55.0 +0200
-@@ -151,8 +151,8 @@
- @$(SUBSTITUTE_UPTIME) $(srcdir)/e2fsck.8.in e2fsck.8
-
- installdirs:
-- @echo MKINSTALLDIRS $(root_sbindir) $(man8dir)
-- @$(MKINSTALLDIRS) $(DESTDIR)$(root_sbindir) \
-+ @echo MKDIR_P $(root_sbindir) $(man8dir)
-+ @$(MKDIR_P) $(DESTDIR)$(root_sbindir) \
- $(DESTDIR)$(man8dir)
-
- install: $(PROGS) $(MANPAGES) installdirs
-diff -urN e2fsprogs-1.38.orig/intl/Makefile.in e2fsprogs-1.38/intl/Makefile.in
e2fsprogs-1.38.orig/intl/Makefile.in 2005-06-29 19:42:20.0
+0200
-+++ e2fsprogs-1.38/intl/Makefile.in2008-10-16 23:44:10.0 +0200
[oe] [PATCH 1/4] bitbake.conf: add ext4 image support
Signed-off-by: Bernhard Reutner-Fischer rep.dot@gmail.com
---
conf/bitbake.conf |6 ++
conf/local.conf.sample |2 +-
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index abe500a..9b0afce 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -366,6 +366,8 @@ IMAGE_CMD_ext2 = genext2fs -b ${ROOTFS_SIZE} -d
${IMAGE_ROOTFS} ${DEPLOY_DIR_IM
IMAGE_CMD_ext2.gz = install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b
${ROOTFS_SIZE} -d ${IMAGE_ROOTFS}
${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f
-9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv
${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz
IMAGE_CMD_ext3 = genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS}
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3
IMAGE_CMD_ext3.gz = install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b
${ROOTFS_SIZE} -d ${IMAGE_ROOTFS}
${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs
-j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9
${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv
${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz
+IMAGE_CMD_ext4 = genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS}
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -j
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4
+IMAGE_CMD_ext4.gz = install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b
${ROOTFS_SIZE} -d ${IMAGE_ROOTFS}
${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs
-j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; gzip -f -9
${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; mv
${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4.gz
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.gz
IMAGE_CMD_squashfs = mksquashfs ${IMAGE_ROOTFS}
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend
IMAGE_CMD_squashfs-lzma = mksquashfs ${IMAGE_ROOTFS}
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD}
-noappend -comp lzma
IMAGE_CMD_tar = cd ${IMAGE_ROOTFS} tar -cvf
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar .
@@ -397,6 +399,8 @@ IMAGE_DEPENDS_ext2 = genext2fs-native
IMAGE_DEPENDS_ext2.gz = genext2fs-native
IMAGE_DEPENDS_ext3 = genext2fs-native e2fsprogs-native
IMAGE_DEPENDS_ext3.gz = genext2fs-native e2fsprogs-native
+IMAGE_DEPENDS_ext4 = genext2fs-native e2fsprogs-native
+IMAGE_DEPENDS_ext4.gz = genext2fs-native e2fsprogs-native
IMAGE_DEPENDS_cpio.gz.u-boot = u-boot-mkimage-native
IMAGE_DEPENDS_cpio.lzma = lzma-native
IMAGE_DEPENDS_squashfs = squashfs-tools-native
@@ -713,6 +717,8 @@ IMAGE_ROOTFS_SIZE_ext2 ?= 65536
IMAGE_ROOTFS_SIZE_ext2.gz ?= 65536
IMAGE_ROOTFS_SIZE_ext3 ?= 65536
IMAGE_ROOTFS_SIZE_ext3.gz ?= 65536
+IMAGE_ROOTFS_SIZE_ext4 ?= 65536
+IMAGE_ROOTFS_SIZE_ext4.gz ?= 65536
DISTRO_PR ?=
# Forcefully set CACHE now so future changes to things like
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 60c10e4..c2d5c54 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -114,7 +114,7 @@ PREFERRED_PROVIDERS +=
virtual/${TARGET_PREFIX}g++:gcc-cross
# INHERIT = package_tar
# Add the required image file system types below. Valid are
-# jffs2, tar(.gz|bz2), cpio(.gz), cramfs, ext2(.gz), ext3(.gz)
+# jffs2, tar(.gz|bz2), cpio(.gz), cramfs, ext2(.gz), ext3(.gz), ext4(.gz),
# squashfs, squashfs-lzma
IMAGE_FSTYPES = jffs2 tar
--
1.7.1
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [PATCH 3/4] git: add 1.7.2.1
Signed-off-by: Bernhard Reutner-Fischer rep.dot@gmail.com
---
.../files/git-gui-install-mode-arg-spaces.patch| 32
recipes/git/files/git-less-hardlinks.diff | 11 ---
recipes/git/git-native_1.7.0.2.bb |8 -
recipes/git/git.inc|2 -
recipes/git/git_1.7.0.2.bb | 28 -
recipes/git/git_1.7.2.1.bb | 29 ++
6 files changed, 35 insertions(+), 75 deletions(-)
delete mode 100644 recipes/git/files/git-gui-install-mode-arg-spaces.patch
delete mode 100644 recipes/git/git-native_1.7.0.2.bb
delete mode 100644 recipes/git/git_1.7.0.2.bb
create mode 100644 recipes/git/git_1.7.2.1.bb
diff --git a/recipes/git/files/git-gui-install-mode-arg-spaces.patch
b/recipes/git/files/git-gui-install-mode-arg-spaces.patch
deleted file mode 100644
index 10e4eb2..000
--- a/recipes/git/files/git-gui-install-mode-arg-spaces.patch
+++ /dev/null
@@ -1,32 +0,0 @@
git/git-gui/Makefile.orig 2007-12-26 17:16:42.0 +1030
-+++ git/git-gui/Makefile 2007-12-26 17:17:16.0 +1030
-@@ -31,11 +31,11 @@
- INSTALL = install
- endif
-
--INSTALL_D0 = $(INSTALL) -d -m755 # space is required here
-+INSTALL_D0 = $(INSTALL) -d -m 755 # space is required here
- INSTALL_D1 =
--INSTALL_R0 = $(INSTALL) -m644 # space is required here
-+INSTALL_R0 = $(INSTALL) -m 644 # space is required here
- INSTALL_R1 =
--INSTALL_X0 = $(INSTALL) -m755 # space is required here
-+INSTALL_X0 = $(INSTALL) -m 755 # space is required here
- INSTALL_X1 =
- INSTALL_L0 = rm -f # space is required here
- INSTALL_L1 = ln # space is required here
-@@ -50,11 +50,11 @@
- QUIET_2DEVNULL = 2/dev/null
-
- INSTALL_D0 = dir=
-- INSTALL_D1 = echo ' ' DEST $$dir $(INSTALL) -d -m755 $$dir
-+ INSTALL_D1 = echo ' ' DEST $$dir $(INSTALL) -d -m 755 $$dir
- INSTALL_R0 = src=
-- INSTALL_R1 = echo ' ' INSTALL 644 `basename $$src` $(INSTALL)
-m644 $$src
-+ INSTALL_R1 = echo ' ' INSTALL 644 `basename $$src` $(INSTALL)
-m 644 $$src
- INSTALL_X0 = src=
-- INSTALL_X1 = echo ' ' INSTALL 755 `basename $$src` $(INSTALL)
-m755 $$src
-+ INSTALL_X1 = echo ' ' INSTALL 755 `basename $$src` $(INSTALL)
-m 755 $$src
-
- INSTALL_L0 = dst=
- INSTALL_L1 = src=
diff --git a/recipes/git/files/git-less-hardlinks.diff
b/recipes/git/files/git-less-hardlinks.diff
index 183fe8f..be4924c 100644
--- a/recipes/git/files/git-less-hardlinks.diff
+++ b/recipes/git/files/git-less-hardlinks.diff
@@ -33,17 +33,18 @@ This patch isn't complete though:
ln -s $ $@ 2/dev/null || \
cp $ $@
-@@ -1830,13 +1828,11 @@
+@@ -2081,14 +2081,12 @@
cp $$bindir/git$X $$execdir/git$X; } ; } \
- { for p in $(BUILT_INS); do \
+ for p in $(BUILT_INS); do \
$(RM) $$execdir/$$p \
- ln $$execdir/git$X $$execdir/$$p 2/dev/null || \
ln -s git$X $$execdir/$$p 2/dev/null || \
cp $$execdir/git$X $$execdir/$$p || exit; \
- done; } \
- { for p in $(REMOTE_CURL_ALIASES); do \
+ done \
+ remote_curl_aliases=$(REMOTE_CURL_ALIASES) \
+ for p in $$remote_curl_aliases; do \
$(RM) $$execdir/$$p \
- ln $$execdir/git-remote-http$X $$execdir/$$p 2/dev/null ||
\
ln -s git-remote-http$X $$execdir/$$p 2/dev/null || \
cp $$execdir/git-remote-http$X $$execdir/$$p || exit; \
- done; } \
+ done \
diff --git a/recipes/git/git-native_1.7.0.2.bb
b/recipes/git/git-native_1.7.0.2.bb
deleted file mode 100644
index b55070a..000
--- a/recipes/git/git-native_1.7.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require git.inc
-inherit native
-DEPENDS = openssl-native curl-native zlib-native expat-native
-PR = r4
-SRC_URI[src.md5sum] = 76518fa774b36de81d160b85fa4f19c1
-SRC_URI[src.sha256sum] =
5601df7fc282fdd66de196b282694eb77dcfc50438f01587de144b3ead1a6b2f
-
-EXTRA_OECONF_append = --without-python
diff --git a/recipes/git/git.inc b/recipes/git/git.inc
index 8275adb..1e69682 100644
--- a/recipes/git/git.inc
+++ b/recipes/git/git.inc
@@ -4,8 +4,6 @@ LICENSE = GPL
SRC_URI =
http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2;name=src;
-S = ${WORKDIR}/git-${PV}
-
inherit autotools
EXTRA_OEMAKE = NO_TCLTK=1
diff --git a/recipes/git/git_1.7.0.2.bb b/recipes/git/git_1.7.0.2.bb
deleted file mode 100644
index a3a73f0..000
--- a/recipes/git/git_1.7.0.2.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-require git.inc
-
-SRC_URI[src.md5sum] = 76518fa774b36de81d160b85fa4f19c1
-SRC_URI[src.sha256sum] =
5601df7fc282fdd66de196b282694eb77dcfc50438f01587de144b3ead1a6b2f
-
-SRC_URI += file://git-less-hardlinks.diff
-
-EXTRA_OECONF += ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes
-
-
-DEPENDS = openssl curl zlib expat
-RDEPENDS_${PN} = perl
Re: [oe] [PATCH v2 1/2] recipe for gsnmp-0.3.0
Frans Meulenbroeks wrote: 2010/8/5 Frans Meulenbroeks fransmeulenbro...@gmail.com: This one also failed building with a similar QA issue: NOTE: Running task 629 of 630 (ID: 10, /home/frans/oe/openembedded/recipes/gsnmp/gsnmp_0.3.0.bb, do_qa_staging) ERROR: QA Issue with staging: libexslt.pc failed sanity test (tmpdir) in path /home/frans/oe/tmp_angstrom/sysroots/armv7a-angstrom-linux-gnueabi/usr/lib/pkgconfig ERROR: QA Issue with staging: libxslt.pc failed sanity test (tmpdir) in path /home/frans/oe/tmp_angstrom/sysroots/armv7a-angstrom-linux-gnueabi/usr/lib/pkgconfig ERROR: QA staging was broken by the package built above see http://tinderbox.openembedded.net/builds/81312 No idea how exactly to fix this. Frans Please disregard ths comment and the one on the other recipe. Apparently some other recipe (libxslt) left a faulty pc file in pkgconfig. That is something that needs to be repaired (although I woudl not know how), but does not affect your recipe. Your recipes have been tested, build nicely and have been pushed. Thank you for your contribution, and again apologies for any inconvenience caused by the above mail) No harm done, I suspected it was someone else's fault this time. Thanks for testing comments. - Henri ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 3/4] git: add 1.7.2.1
Dear Bernhard,
Am Freitag, den 06.08.2010, 11:40 +0200 schrieb Bernhard Reutner-Fischer:
Signed-off-by: Bernhard Reutner-Fischer rep.dot@gmail.com
[…]
diff --git a/recipes/git/files/git-less-hardlinks.diff
b/recipes/git/files/git-less-hardlinks.diff
index 183fe8f..be4924c 100644
--- a/recipes/git/files/git-less-hardlinks.diff
+++ b/recipes/git/files/git-less-hardlinks.diff
@@ -33,17 +33,18 @@ This patch isn't complete though:
ln -s $ $@ 2/dev/null || \
cp $ $@
-@@ -1830,13 +1828,11 @@
+@@ -2081,14 +2081,12 @@
cp $$bindir/git$X $$execdir/git$X; } ; } \
- { for p in $(BUILT_INS); do \
+ for p in $(BUILT_INS); do \
$(RM) $$execdir/$$p \
-ln $$execdir/git$X $$execdir/$$p 2/dev/null || \
ln -s git$X $$execdir/$$p 2/dev/null || \
cp $$execdir/git$X $$execdir/$$p || exit; \
- done; } \
- { for p in $(REMOTE_CURL_ALIASES); do \
+ done \
+ remote_curl_aliases=$(REMOTE_CURL_ALIASES) \
+ for p in $$remote_curl_aliases; do \
$(RM) $$execdir/$$p \
-ln $$execdir/git-remote-http$X $$execdir/$$p 2/dev/null ||
\
ln -s git-remote-http$X $$execdir/$$p 2/dev/null || \
cp $$execdir/git-remote-http$X $$execdir/$$p || exit; \
- done; } \
+ done \
did you take Yann’s patches into consideration [1].
diff --git a/recipes/git/git-native_1.7.0.2.bb
b/recipes/git/git-native_1.7.0.2.bb
deleted file mode 100644
index b55070a..000
--- a/recipes/git/git-native_1.7.0.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require git.inc
-inherit native
-DEPENDS = openssl-native curl-native zlib-native expat-native
-PR = r4
-SRC_URI[src.md5sum] = 76518fa774b36de81d160b85fa4f19c1
-SRC_URI[src.sha256sum] =
5601df7fc282fdd66de196b282694eb77dcfc50438f01587de144b3ead1a6b2f
-
-EXTRA_OECONF_append = --without-python
diff --git a/recipes/git/git.inc b/recipes/git/git.inc
index 8275adb..1e69682 100644
--- a/recipes/git/git.inc
+++ b/recipes/git/git.inc
@@ -4,8 +4,6 @@ LICENSE = GPL
SRC_URI =
http://www.kernel.org/pub/software/scm/git/git-${PV}.tar.bz2;name=src;
-S = ${WORKDIR}/git-${PV}
-
inherit autotools
EXTRA_OEMAKE = NO_TCLTK=1
diff --git a/recipes/git/git_1.7.0.2.bb b/recipes/git/git_1.7.0.2.bb
deleted file mode 100644
index a3a73f0..000
--- a/recipes/git/git_1.7.0.2.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-require git.inc
-
-SRC_URI[src.md5sum] = 76518fa774b36de81d160b85fa4f19c1
-SRC_URI[src.sha256sum] =
5601df7fc282fdd66de196b282694eb77dcfc50438f01587de144b3ead1a6b2f
-
-SRC_URI += file://git-less-hardlinks.diff
-
-EXTRA_OECONF += ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes
-
-
-DEPENDS = openssl curl zlib expat
-RDEPENDS_${PN} = perl perl-module-file-path cpio findutils sed
-
-# Dropbear ssh needs a wrapper script, so install openssh-ssh to make it
work out of the box
-RRECOMMENDS_${PN} = openssh-ssh
-
-PR = r6
-
-do_install_append() {
- # Fix broken hardlinks
- for gitprog in git-receive-pack git-upload-archive ; do
- rm ${D}${bindir}/$gitprog
- ln -sf ${bindir}/git ${D}${bindir}/$gitprog
- done
- rm ${D}${libexecdir}/git-core/git ln -sf ${bindir}/git
${D}${libexecdir}/git-core/git
-}
-
-FILES_${PN}-dbg += ${libexecdir}/git-core/.debug
diff --git a/recipes/git/git_1.7.2.1.bb b/recipes/git/git_1.7.2.1.bb
new file mode 100644
index 000..4e07d86
--- /dev/null
+++ b/recipes/git/git_1.7.2.1.bb
@@ -0,0 +1,29 @@
+require git.inc
+
+SRC_URI[src.md5sum] = 24a443a120a0ab372185cb6bc0dbd934
+SRC_URI[src.sha256sum] =
5446b4ece3b8d81b1fcbcd6c4b91f1961b6f4047a3f6173e3200bee368724921
+
+SRC_URI += file://git-less-hardlinks.diff
+BBCLASSEXTEND = native
+
+EXTRA_OECONF += ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes
+EXTRA_OECONF_append-native = --without-python
+
+DEPENDS = openssl curl zlib expat
+RDEPENDS_${PN} = perl perl-module-file-path cpio findutils sed
+
+# Dropbear ssh needs a wrapper script, so install openssh-ssh to make it
work out of the box
+RRECOMMENDS_${PN} = openssh-ssh
+
+PR = r0
+
+do_install_append() {
+ # Fix broken hardlinks
+ #for gitprog in git-receive-pack git-upload-archive ; do
+ # rm ${D}${bindir}/$gitprog
+ # ln -sf ${bindir}/git ${D}${bindir}/$gitprog
+ #done
+ #rm ${D}${libexecdir}/git-core/git ln -sf ${bindir}/git
${D}${libexecdir}/git-core/git
+}
Can this be removed?
+FILES_${PN}-dbg += ${libexecdir}/git-core/.debug
It would be great if you could comment the changes in the commit
message.
Thanks,
Paul
[1] http://patchwork.openembedded.org/patch/2543/
signature.asc
Description: This is a digitally signed message part
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
Re: [oe] [PATCH 3/4] git: add 1.7.2.1
On Fri, Aug 06, 2010 at 12:07:29PM +0200, Paul Menzel wrote: did you take Yann’s patches into consideration [1]. [1] http://patchwork.openembedded.org/patch/2543/ Didn't see that, no. Let me verify this. ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [RFD] openmoko status (and more specifically ./distro/include/preferred-om-2008-versions.inc)
Hi, I was wondering whether someone is still doing something with openmoko. Rationale for asking is that om-2008 pins a lot of recipes in ./distro/include/preferred-om-2008-versions.inc Now that is not necessarily bad, but some of those pinngs are to very old recipes. Some of these recipes use legacy staging, whereas the leading recipe (which is much newer) does not use legacy staging any more. That brought me to the question is anyone still using this? If not, should we remove om support (or at least release the pinnings) so some of those old recipes can be retired. And if it still used, may I request the users to either - move to later versions (especially for versions that have a -native variant or use legacy staging) or (at your discretion) - fix the recipe involved. Best regards, Frans ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] patchwork, please keep patches up to date
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 06-08-10 11:03, Paul Menzel wrote: Dear OE folks, Am Donnerstag, den 05.08.2010, 21:30 +0200 schrieb Koen Kooi: […] I had a look around patchwork and I noticed lots of duplicates and already applied patches are still in the queue, so I have a small request: Could the people sending patches to this mailinglist update their status in patchwork? And can people applying patches also update the status? there is also `pwclient` for the command line. Please take a look at the Wiki page [1] for more information. By the way, there are some examples in the Patchwork repository for post commit hooks to mark those patches automatically as applied. (Since the Patchwork repository is not browsable take a look at [2] for example.) That would be nice to have once patchwork will live on the same server as the git repo. Maybe someone from the infrastructure team can give an update on that situation. regards, Koen -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.5 (Darwin) iD8DBQFMW+uyMkyGM64RGpERAoUDAJ9eNHSM/EYamBCJC8I/jR27FyjpaQCgoiiW fGPUbahE2rPSmpOCfyQFR8A= =FSPp -END PGP SIGNATURE- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 1/4] bitbake.conf: add ext4 image support
Hi,
On 6 August 2010 11:40, Bernhard Reutner-Fischer rep.dot@gmail.com wrote:
Signed-off-by: Bernhard Reutner-Fischer rep.dot@gmail.com
---
conf/bitbake.conf | 6 ++
conf/local.conf.sample | 2 +-
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index abe500a..9b0afce 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -366,6 +366,8 @@ IMAGE_CMD_ext2 = genext2fs -b ${ROOTFS_SIZE} -d
${IMAGE_ROOTFS} ${DEPLOY_DIR_IM
IMAGE_CMD_ext2.gz = install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b
${ROOTFS_SIZE} -d ${IMAGE_ROOTFS}
${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip
-f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv
${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz
IMAGE_CMD_ext3 = genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS}
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3
IMAGE_CMD_ext3.gz = install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b
${ROOTFS_SIZE} -d ${IMAGE_ROOTFS}
${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD};
tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9
${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv
${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz
+IMAGE_CMD_ext4 = genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS}
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD}; tune2fs -j
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4
+IMAGE_CMD_ext4.gz = install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b
${ROOTFS_SIZE} -d ${IMAGE_ROOTFS}
${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4 ${EXTRA_IMAGECMD};
tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; gzip -f -9
${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4; mv
${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext4.gz
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4.gz
It seems the IMAGE_CMDs for ext3 and ext4 exactly alike (except for the
filename)? Or am I missing something? According to [1], converting ext2 fs
to ext4 is performed like this:
tune2fs -j /dev/DEV
tune2fs -O extents,uninit_bg,dir_index /dev/DEV
followed by a fsck to fix up some structures
e2fsck -fDC0 /dev/DEV
Best regards,
Bjørn Forsman
[1]: https://ext4.wiki.kernel.org/index.php/Ext4_Howto
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] xserver-xorg -- which video driver for Atom Z510-based system with integrated graphics
My target system is a COM Express module with a 1.1 GHz Z510 Atom and Intel integrated graphics. With xserver-xorg 1.6.1, the VESA driver worked fine, but when I try to run 1.7.4, I get no video modes. Is anyone here running OE w/ xorg 1.7.4 on a Atom system? Thanks, Jay ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [PATCH] linux-omap-psp: Add camera bootarg
--- conf/machine/include/omap3.inc |2 +- recipes/linux/linux-omap-psp_2.6.32.bb |1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc index 7c30288..0b8e42e 100644 --- a/conf/machine/include/omap3.inc +++ b/conf/machine/include/omap3.inc @@ -3,7 +3,7 @@ SOC_FAMILY = omap3 require conf/machine/include/tune-cortexa8.inc PREFERRED_PROVIDER_virtual/kernel = linux-omap # Increase this everytime you change something in the kernel -MACHINE_KERNEL_PR = r86 +MACHINE_KERNEL_PR = r87 KERNEL_IMAGETYPE = uImage diff --git a/recipes/linux/linux-omap-psp_2.6.32.bb b/recipes/linux/linux-omap-psp_2.6.32.bb index 887e3d5..03706cd 100644 --- a/recipes/linux/linux-omap-psp_2.6.32.bb +++ b/recipes/linux/linux-omap-psp_2.6.32.bb @@ -132,6 +132,7 @@ SRC_URI = git://arago-project.org/git/people/sriram/ti-psp-omap.git;protocol=gi file://cam/0003-mt9v113-Fix-State-variable-handling.patch \ file://cam/0001-Move-sensor-rest-to-after-applying-power.patch \ file://0001-BeagleBoard-Adjust-USER-button-pin-for-xM.patch \ + file://0001-omap3beagle-Add-camera-bootarg.patch \ file://defconfig SRC_URI_append_beagleboard = file://logo_linux_clut224.ppm \ -- 1.5.6.4 ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 1/3] cmake-native: add recipe for cmake 2.8.2.
On Tue, Jul 27, 2010 at 9:43 AM, David Kozub z...@linux.fjfi.cvut.cz wrote:
On Tue, 27 Jul 2010, Henning Heinold wrote:
Eduardo Lima sends in patches for cmake 2.8 too. So please coordinate with
him.
I would like to see a fine recipe with which uses the latest features
available in OE like BBCLASSEXTENDED and so on.
I missed it. It even seems he's been working on webkit-efl too. I'll try to
contact him.
As for the cmake - I tried and failed. My problem is:
* cmake is built using cmake-native, and it uses inherit cmake
* I can't have inherit cmake in the native recipe, as it would be a circular
dependency
* I got stuck on: can I somehow inherit cmake only for the non-native
case?
looks strange, but works:
BBCLASSEXTEND = native
IS_NATIVE = no
IS_NATIVE_virtclass-native = yes
INHERIT += $...@base_conditional(IS_NATIVE, no, autotools cmake,
autotools, d)}
looks even better, and still works:
INHERIT_CLASSES = autotools cmake
INHERIT_CLASSES_virtclass-native = autotools
INHERIT += ${INHERIT_CLASSES}
looks even better, and fails somehow :/:
INHERIT_CLASSES = cmake
INHERIT_CLASSES_virtclass-native =
inherit autotools ${INHERIT_CLASSES}
looks better, but fails:
INHERIT_CLASSES = autotools cmake
INHERIT_CLASSES_virtclass-native = autotools
inherit ${INHERIT_CLASSES}
- ParseError: Could not inherit file classes/autotools cmake.bbclass
Tested only by checking -e output!
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH] Remove redundant dependencies upon opkg and opkg-collateral.
On Thu, Aug 5, 2010 at 4:15 PM, Chris Larson clar...@kergoth.com wrote: On Wed, Aug 4, 2010 at 11:58 PM, Graham Gower graham.go...@gmail.comwrote: rootfs_ipk.bbclass already pulls these in, so avoid some confusion. This is totally untested. Signed-off-by: Graham Gower graham.go...@gmail.com Looks reasonable to me. Acked-by: Chris Larson clar...@kergoth.com I've already pushed it, but too late I noticed that only rootfs_ipk is handling DISTRO_PACKAGE_MANAGER and rpm/deb based rootfs will probably loose DISTRO_PACKAGE_MANAGER from image. Should I revert now or can we fix it soon? ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH v2 1/2] recipe for gsnmp-0.3.0
Still one issue left: I saw this warning when building another package: /home/frans/oe/tmp_angstrom/sysroots/armv7a-angstrom-linux-gnueabi/usr/share/aclocal/gsnmp.m4:4: warning: underquoted definition of AM_PATH_GSNMP /home/frans/oe/tmp_angstrom/sysroots/armv7a-angstrom-linux-gnueabi/usr/share/aclocal/gsnmp.m4:4: run info '(automake)Extending aclocal' /home/frans/oe/tmp_angstrom/sysroots/armv7a-angstrom-linux-gnueabi/usr/share/aclocal/gsnmp.m4:4: or see http://sources.redhat.com/automake/automake.html#Extending-aclocal I suggest a patch to resolve this. Frans ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [PATCH] linux-omap-psp: Add camera bootarg
Signed-off-by: Jason Kridner jkrid...@beagleboard.org
---
conf/machine/include/omap3.inc |2 +-
.../cam/0001-omap3beagle-Add-camera-bootarg.patch | 108
recipes/linux/linux-omap-psp_2.6.32.bb |1 +
3 files changed, 110 insertions(+), 1 deletions(-)
create mode 100644
recipes/linux/linux-omap-psp-2.6.32/cam/0001-omap3beagle-Add-camera-bootarg.patch
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 7c30288..0b8e42e 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -3,7 +3,7 @@ SOC_FAMILY = omap3
require conf/machine/include/tune-cortexa8.inc
PREFERRED_PROVIDER_virtual/kernel = linux-omap
# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = r86
+MACHINE_KERNEL_PR = r87
KERNEL_IMAGETYPE = uImage
diff --git
a/recipes/linux/linux-omap-psp-2.6.32/cam/0001-omap3beagle-Add-camera-bootarg.patch
b/recipes/linux/linux-omap-psp-2.6.32/cam/0001-omap3beagle-Add-camera-bootarg.patch
new file mode 100644
index 000..0d93cee
--- /dev/null
+++
b/recipes/linux/linux-omap-psp-2.6.32/cam/0001-omap3beagle-Add-camera-bootarg.patch
@@ -0,0 +1,108 @@
+From c1442ebdb0c717931557bebbeab314e44bf3 Mon Sep 17 00:00:00 2001
+From: Sergio Aguirre saagui...@ti.com
+Date: Thu, 22 Jul 2010 15:38:43 -0500
+Subject: [PATCH 1/2] omap3beagle: Add camera bootarg
+
+This adds a new 'camera' bootarg, with (so far) 2 new possible types:
+- lbcmvga: Leopard Board Camera Module: MT9V113 VGA
+- lbcm3m1: Leopard Board Camera Module: MT9T111 3MP
+
+Also, cleans up a little bit the current i2c2 bus init code.
+
+Signed-off-by: Sergio Aguirre saagui...@ti.com
+---
+ arch/arm/mach-omap2/board-omap3beagle.c | 42 +--
+ 1 files changed, 34 insertions(+), 8 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/board-omap3beagle.c
b/arch/arm/mach-omap2/board-omap3beagle.c
+index f93616b..2677b41 100644
+--- a/arch/arm/mach-omap2/board-omap3beagle.c
b/arch/arm/mach-omap2/board-omap3beagle.c
+@@ -89,6 +89,7 @@ extern struct mt9t112_platform_data mt9t112_pdata;
+ #define NAND_BLOCK_SIZE SZ_128K
+
+ char expansionboard_name[16];
++char cameraboard_name[16];
+
+ #if defined(CONFIG_ENC28J60) || defined(CONFIG_ENC28J60_MODULE)
+
+@@ -595,13 +596,16 @@ static struct i2c_board_info __initdata
beagle_zippy_i2c2_boardinfo[] = {
+ static struct i2c_board_info __initdata beagle_zippy_i2c2_boardinfo[] = {};
+ #endif
+
+-static struct i2c_board_info __initdata beagle_i2c2_boardinfo[] = {
++static struct i2c_board_info __initdata beagle_lbcmvga_i2c2_boardinfo[] = {
+ #if defined(CONFIG_VIDEO_MT9V113) || defined(CONFIG_VIDEO_MT9V113_MODULE)
+ {
+ I2C_BOARD_INFO(mt9v113, MT9V113_I2C_ADDR),
+ .platform_data = mt9v113_pdata,
+ },
+ #endif
++};
++
++static struct i2c_board_info __initdata beagle_lbcm3m1_i2c2_boardinfo[] = {
+ #if defined(CONFIG_VIDEO_MT9T112) || defined(CONFIG_VIDEO_MT9T112_MODULE)
+ {
+ I2C_BOARD_INFO(mt9t112, MT9T112_I2C_ADDR),
+@@ -614,15 +618,27 @@ static int __init omap3_beagle_i2c_init(void)
+ {
+ omap_register_i2c_bus(1, 2600, beagle_i2c1_boardinfo,
+ ARRAY_SIZE(beagle_i2c1_boardinfo));
+- if(!strcmp(expansionboard_name, zippy) ||
!strcmp(expansionboard_name, zippy2))
+- {
+- printk(KERN_INFO Beagle expansionboard: registering i2c2 bus
for zippy/zippy2\n);
++
++ if (!strcmp(expansionboard_name, zippy) ||
++ !strcmp(expansionboard_name, zippy2)) {
++ printk(KERN_INFO Beagle expansionboard:
++registering i2c2 bus for zippy/zippy2\n);
+ omap_register_i2c_bus(2, 400, beagle_zippy_i2c2_boardinfo,
+ ARRAY_SIZE(beagle_zippy_i2c2_boardinfo));
+- } else
+- {
+- omap_register_i2c_bus(2, 400, beagle_i2c2_boardinfo,
+- ARRAY_SIZE(beagle_i2c2_boardinfo));
++ } else {
++ if (!strcmp(cameraboard_name, lbcmvga)) {
++ printk(KERN_INFO Beagle cameraboard:
++registering i2c2 bus for lbcmvga\n);
++ omap_register_i2c_bus(2, 400,
beagle_lbcmvga_i2c2_boardinfo,
++
ARRAY_SIZE(beagle_lbcmvga_i2c2_boardinfo));
++ } else if (!strcmp(cameraboard_name, lbcm3m1)) {
++ printk(KERN_INFO Beagle cameraboard:
++registering i2c2 bus for lbcm3m1\n);
++ omap_register_i2c_bus(2, 400,
beagle_lbcm3m1_i2c2_boardinfo,
++
ARRAY_SIZE(beagle_lbcm3m1_i2c2_boardinfo));
++ } else {
++ omap_register_i2c_bus(2, 400, NULL, 0);
++ }
+ }
+ /* Bus 3 is attached to the DVI port where devices
[oe] [PATCH] busybox: fix defconfig handling problems triggered by configure according to {MACHINE, DISTRO}_FEATURES; added inetd handling
Bugfix:
Use ${S}/.config instead of ${WORKINGDIR}/defconfig for installing
configuration dependent parts.
Now the changes done by DISTRO_FEATURES processing are treated in
do_install().
Enhancements:
Added configuration dependent packages for inetd, telnetd, httpd which
enable inetd based daemon starting or standalone starting by installing
separate packages.
Enable starting of ftpd using inetd.
---
recipes/busybox/busybox.inc | 220
++---
recipes/busybox/busybox_1.16.2.bb |7 +-
recipes/busybox/files/busybox-inetd | 43 +++
recipes/busybox/files/busybox-telnetd | 39 ++
recipes/busybox/files/inetd.conf |9 ++
5 files changed, 296 insertions(+), 22 deletions(-)
create mode 100644 recipes/busybox/files/busybox-inetd
create mode 100644 recipes/busybox/files/busybox-telnetd
create mode 100644 recipes/busybox/files/inetd.conf
diff --git a/recipes/busybox/busybox.inc b/recipes/busybox/busybox.inc
index a64c031..b4663f0 100644
--- a/recipes/busybox/busybox.inc
+++ b/recipes/busybox/busybox.inc
@@ -26,13 +26,23 @@ SRC_URI = \
file://syslog.conf \
file://udhcpscript.patch \
file://umount.busybox \
+ file://inetd.conf \
+ file://busybox-inetd \
+ file://busybox-telnetd \
SRC_URI_append_nylon = file://xargs-double-size.patch
export EXTRA_CFLAGS = ${CFLAGS}
EXTRA_OEMAKE_append = CROSS=${HOST_PREFIX}
-PACKAGES =+ ${PN}-mountall ${PN}-httpd ${PN}-syslog ${PN}-udhcpd
+PACKAGES =+ ${PN}-mountall ${PN}-httpd ${PN}-syslog ${PN}-udhcpd
${PN}-telnetd ${PN}-inetd
+
+DESCRIPTION_${PN}-inetd = Add starting busybox inetd as daemon while
booting
+DESCRIPTION_${PN}-httpd = Add starting busybox httpd as daemon while
booting
+DESCRIPTION_${PN}-syslog = Add busybox syslog
+DESCRIPTION_${PN}-udhcpd = Add starting busybox udhcpd as daemon while
booting
+DESCRIPTION_${PN}-telnetd = Add starting busybox telnetd as daemon
while booting
+DESCRIPTION_${PN}-mountall = Add busybox mountall
# We need this RRECOMMENDS_${PN} because libc dlopens libgcc
# and shlib mechanism can not detect it because its not
@@ -48,16 +58,25 @@ RRECOMMENDS_${PN} += libgcc ${PN}-syslog
FILES_${PN}-httpd = ${sysconfdir}/init.d/busybox-httpd /srv/www
FILES_${PN}-syslog = ${sysconfdir}/init.d/syslog.${PN}
${sysconfdir}/syslog.conf
FILES_${PN}-udhcpd = ${sysconfdir}/init.d/busybox-udhcpd
+FILES_${PN}-telnetd = ${sysconfdir}/init.d/busybox-telnetd
FILES_${PN} += ${datadir}/udhcpc
+FILES_${PN}-inetd = \
+ ${sysconfdir}/init.d/busybox-inetd \
+ ${sysconfdir}/inetd.conf \
+
+
# syslog initscript is handled explicitly because order of
# update-rc.d and update-alternatives is important (see below)
-INITSCRIPT_PACKAGES = ${PN}-httpd ${PN}-udhcpd
+INITSCRIPT_PACKAGES = ${PN}-httpd ${PN}-udhcpd ${PN}-inetd
${PN}-telnetd
INITSCRIPT_NAME_${PN}-httpd = busybox-httpd
INITSCRIPT_NAME_${PN}-syslog = syslog
INITSCRIPT_NAME_${PN}-udhcpd = busybox-udhcpd
+INITSCRIPT_NAME_${PN}-inetd = busybox-inetd
+INITSCRIPT_NAME_${PN}-telnetd = busybox-telnetd
CONFFILES_${PN}-syslog = ${sysconfdir}/syslog.conf
+CONFFILES_${PN}-inetd = ${sysconfdir}/inetd.conf
# This disables the syslog startup links in slugos (see slugos-init)
INITSCRIPT_PARAMS_${PN}-syslog_slugos = start 20 .
@@ -65,12 +84,14 @@ INITSCRIPT_PARAMS_${PN}-syslog_slugos = start 20 .
RDEPENDS_${PN}-httpd += ${PN}
RDEPENDS_${PN}-syslog += ${PN}
RDEPENDS_${PN}-udhcpd += ${PN}
+RDEPENDS_${PN}-inetd += ${PN}
+RDEPENDS_${PN}-telnetd += ${PN}
# Use gcc for linking so LDFLAGS actually makes sense
LD = ${CC} -nostdlib
inherit cml1 update-rc.d
-require busybox-config.inc
+require recipes/busybox/busybox-config.inc
configmangle = '/CROSS_COMPILER_PREFIX/d; \
/CONFIG_EXTRA_CFLAGS/d; \
@@ -135,11 +156,14 @@ do_install () {
install -d ${D}${sysconfdir}/init.d
- if ! grep -q CONFIG_FEATURE_INDIVIDUAL=y ${WORKDIR}/defconfig;
then
+#use the fixed config file to get real build settings
+BUSYBOX_CONFIG_FILE=${S}/.config
+
+ if ! grep -q CONFIG_FEATURE_INDIVIDUAL=y $BUSYBOX_CONFIG_FILE;
then
# Install /bin/busybox, and the /bin/sh link so the
postinst script
# can run. Let update-alternatives handle the rest.
install -d ${D}${base_bindir}
- if grep -q CONFIG_FEATURE_SUID=y ${WORKDIR}/defconfig;
then
+ if grep -q CONFIG_FEATURE_SUID=y $BUSYBOX_CONFIG_FILE;
then
install -m 4755 ${S}/busybox ${D}${base_bindir}
else
install -m 0755 ${S}/busybox ${D}${base_bindir}
@@ -165,34 +189,97 @@ do_install () {
fi
fi
- if grep -q CONFIG_SYSLOGD=y ${WORKDIR}/defconfig; then
+ if grep -q CONFIG_SYSLOGD=y $BUSYBOX_CONFIG_FILE; then
install -m 0755 ${WORKDIR}/syslog
${D}${sysconfdir}/init.d/syslog.${PN}
install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/
fi
-
Re: [oe] [PATCH] busybox: fix defconfig handling problems triggered by configure according to {MACHINE, DISTRO}_FEATURES; added inetd handling
Hi Wolfgang, thanks for the patch. Would be nice if you can resend the patch with a comment according to the oe guidelines mentioned here http://wiki.openembedded.net/index.php/Commit_log_example Bye Henning ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH 1/3] cmake-native: add recipe for cmake 2.8.2.
On Fri, Aug 6, 2010 at 10:26 AM, Martin Jansa martin.ja...@gmail.com wrote:
On Tue, Jul 27, 2010 at 9:43 AM, David Kozub z...@linux.fjfi.cvut.cz wrote:
On Tue, 27 Jul 2010, Henning Heinold wrote:
Eduardo Lima sends in patches for cmake 2.8 too. So please coordinate with
him.
I would like to see a fine recipe with which uses the latest features
available in OE like BBCLASSEXTENDED and so on.
I missed it. It even seems he's been working on webkit-efl too. I'll try to
contact him.
As for the cmake - I tried and failed. My problem is:
* cmake is built using cmake-native, and it uses inherit cmake
* I can't have inherit cmake in the native recipe, as it would be a circular
dependency
* I got stuck on: can I somehow inherit cmake only for the non-native
case?
looks strange, but works:
BBCLASSEXTEND = native
IS_NATIVE = no
IS_NATIVE_virtclass-native = yes
INHERIT += $...@base_conditional(IS_NATIVE, no, autotools cmake,
autotools, d)}
looks even better, and still works:
INHERIT_CLASSES = autotools cmake
INHERIT_CLASSES_virtclass-native = autotools
INHERIT += ${INHERIT_CLASSES}
looks even better, and fails somehow :/:
INHERIT_CLASSES = cmake
INHERIT_CLASSES_virtclass-native =
inherit autotools ${INHERIT_CLASSES}
looks better, but fails:
INHERIT_CLASSES = autotools cmake
INHERIT_CLASSES_virtclass-native = autotools
inherit ${INHERIT_CLASSES}
- ParseError: Could not inherit file classes/autotools cmake.bbclass
Tested only by checking -e output!
Well, maybe that was too much for my restricted OE knowledge. Anyway,
are you sure the non-native build works? In many tests David and I did
together, there was need for many tweaks on the non-native. It worths
taking a look here anyhow.
Best Regards, Etrunko
--
Eduardo de Barros Lima
ebl...@gmail.com
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [RFC] openocd-native_svn.bb
Hi, I bumped upon openocd-native_svn.bb and I was wondering why we have that. No-one seems to depend on it. Do we want our own openocd instead of the one that is on the host? Or should this be removed? Frans ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH] Remove redundant dependencies upon opkg and opkg-collateral.
On 6 August 2010 23:24, Martin Jansa martin.ja...@gmail.com wrote: On Thu, Aug 5, 2010 at 4:15 PM, Chris Larson clar...@kergoth.com wrote: On Wed, Aug 4, 2010 at 11:58 PM, Graham Gower graham.go...@gmail.comwrote: rootfs_ipk.bbclass already pulls these in, so avoid some confusion. This is totally untested. Signed-off-by: Graham Gower graham.go...@gmail.com Looks reasonable to me. Acked-by: Chris Larson clar...@kergoth.com I've already pushed it, but too late I noticed that only rootfs_ipk is handling DISTRO_PACKAGE_MANAGER and rpm/deb based rootfs will probably loose DISTRO_PACKAGE_MANAGER from image. Should I revert now or can we fix it soon? DISTRO_PACKAGE_MANAGER has been removed altogether. I can't see how it would work reliably for all images - which is probably why it had multiple definitions in the first place. And you could still end up with opkg in your image when setting it to something else, e.g. minimal-gpe-image and slugos pulled opkg in unconditionally. DISTRO_PACKAGE_MANAGER could be fixed if it was put in a common location like image.bbclass. What is the intended mechanism for selecting a package manager? INHERIT = package_foo looks like its going to do the trick for ipk and deb. package_rpm.bbclass might need BOOTSTRAP_EXTRA_RDEPENDS += rpm or something. -Graham ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH] Remove redundant dependencies upon opkg and opkg-collateral.
PS: looks like I missed a couple of locations where opkg is pulled in unconditionally with DISTRO_EXTRA_RDEPENDS conf/distro/kaeilos.conf conf/distro/include/angstrom-2007-for-openmoko.inc ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH] Remove redundant dependencies upon opkg and opkg-collateral.
On Fri, Aug 6, 2010 at 6:29 PM, Graham Gower graham.go...@gmail.com wrote: On 6 August 2010 23:24, Martin Jansa martin.ja...@gmail.com wrote: On Thu, Aug 5, 2010 at 4:15 PM, Chris Larson clar...@kergoth.com wrote: On Wed, Aug 4, 2010 at 11:58 PM, Graham Gower graham.go...@gmail.com wrote: rootfs_ipk.bbclass already pulls these in, so avoid some confusion. This is totally untested. Signed-off-by: Graham Gower graham.go...@gmail.com Looks reasonable to me. Acked-by: Chris Larson clar...@kergoth.com I've already pushed it, but too late I noticed that only rootfs_ipk is handling DISTRO_PACKAGE_MANAGER and rpm/deb based rootfs will probably loose DISTRO_PACKAGE_MANAGER from image. Should I revert now or can we fix it soon? DISTRO_PACKAGE_MANAGER has been removed altogether. I can't see how it would work reliably for all images - which is probably why it had multiple definitions in the first place. And you could still end up with opkg in your image when setting it to something else, e.g. minimal-gpe-image and slugos pulled opkg in unconditionally. DISTRO_PACKAGE_MANAGER could be fixed if it was put in a common location like image.bbclass. What is the intended mechanism for selecting a package manager? INHERIT = package_foo looks like its going to do the trick for ipk and deb. package_rpm.bbclass might need BOOTSTRAP_EXTRA_RDEPENDS += rpm or something. BOOTSTRAP_EXTRA_RDEPENDS is a remnant. We wouldn't want them controlling it from there anyway. The fact that I INHERIT package_ipk doesn't mean I'm constructing an ipk image, only that I'm *emitting* packages of that format. IMAGE_PKGTYPE controls which rootfs_* bbclass will be used to construct the image, but that doesn't control which package *manager* for that type will be used, nor whether it should be installed at all (ONLINE_PACKAGE_MANAGEMENT). -- Christopher Larson clarson at kergoth dot com Founder - BitBake, OpenEmbedded, OpenZaurus Maintainer - Tslib Senior Software Engineer, Mentor Graphics ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [PATCH] Remove redundant dependencies upon opkg and opkg-collateral.
On 7 August 2010 11:19, Chris Larson clar...@kergoth.com wrote: BOOTSTRAP_EXTRA_RDEPENDS is a remnant. We wouldn't want them controlling it from there anyway. The fact that I INHERIT package_ipk doesn't mean I'm constructing an ipk image, only that I'm *emitting* packages of that format. IMAGE_PKGTYPE controls which rootfs_* bbclass will be used to construct the image, but that doesn't control which package *manager* for that type will be used, nor whether it should be installed at all (ONLINE_PACKAGE_MANAGEMENT). Thanks, that does clear up how things are intended to behave. However it doesn't reflect the reality of package_deb.bbclass and package_ipk.bbclass, which both add their package managers to the image unconditionally. i.e. using INHERIT=package_ipk and ONLINE_PACKAGE_MANAGEMENT=none will still get you an image with opkg installed. My intention here is to cut off some of opkg's tentacles in OE. I expect more pruning will be required. -Graham ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
