diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-06-10 20:14:50 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-06-10 20:14:50 +0200 |
| commit | 760bd999661cb210addb26eb56d4178cedc6a229 (patch) | |
| tree | cb38a06e9c2dc1276900199c2b73cb3d88f0214a /recipes | |
| parent | f2f60923cae4f73c0ce879a2d8cd3bb705f61735 (diff) | |
| parent | cc21365c2f40c402905d2e39074c9db291635458 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/linux/linux-powerpc-fsl_git.bb | 4 | ||||
| -rw-r--r-- | recipes/sysklogd/sysklogd.inc | 3 | ||||
| -rw-r--r-- | recipes/sysklogd/sysklogd_1.5.bb | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/recipes/linux/linux-powerpc-fsl_git.bb b/recipes/linux/linux-powerpc-fsl_git.bb index 6d9ab5bbb5..60b7b0e5d5 100644 --- a/recipes/linux/linux-powerpc-fsl_git.bb +++ b/recipes/linux/linux-powerpc-fsl_git.bb @@ -3,12 +3,12 @@ require linux.inc -FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-powerpc-fsl-git/${MACHINE}" +FILESPATHPKG =. "linux-powerpc-fsl-git/${MACHINE}:" SRCREV = "1406de8e11eb043681297adf86d6892ff8efc27a" PV = "2.6.30" -PR = "r3" +PR = "r4" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git;protocol=git \ file://defconfig" diff --git a/recipes/sysklogd/sysklogd.inc b/recipes/sysklogd/sysklogd.inc index da05c0e02e..2fdc49c543 100644 --- a/recipes/sysklogd/sysklogd.inc +++ b/recipes/sysklogd/sysklogd.inc @@ -1,7 +1,6 @@ LICENSE = "GPL" SECTION = "base" -DESCRIPTION = "The sysklogd package implements \ -two system log daemons." +DESCRIPTION = "The sysklogd package implements two system log daemons." SRC_URI = "http://www.ibiblio.org/pub/Linux/system/daemons/sysklogd-${PV}.tar.gz \ file://nonrootinstall.patch;patch=1" diff --git a/recipes/sysklogd/sysklogd_1.5.bb b/recipes/sysklogd/sysklogd_1.5.bb index 31843d603f..37cfd7f28d 100644 --- a/recipes/sysklogd/sysklogd_1.5.bb +++ b/recipes/sysklogd/sysklogd_1.5.bb @@ -1 +1,4 @@ require sysklogd.inc +PR = "r1" + +SRC_URI += "file://no-strip-install.patch;patch=1" |