diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-01-07 15:40:08 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-01-07 15:40:08 +0000 |
| commit | 796d95e4dd0afa1dccef44c003df614ea0630b86 (patch) | |
| tree | f68c9bd3281f0bc02698aa38a2fc0186bfbd513f | |
| parent | b2d92b9af5473339edb902f7fea7dcad09ef57af (diff) | |
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/01/07 16:24:49+01:00 (none)!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into lieve.(none):/data/build/oe/clean-tree/openembedded
2005/01/07 16:24:32+01:00 (none)!koen
change gpe-nmf RDEPENDS to gst-plugins
2005/01/07 15:39:33+01:00 (none)!br1
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into null.(none):/data/mtx/closed/build/unstable/openembedded
2005/01/07 15:39:00+01:00 (none)!br1
perl: reorder split_packages to fix module packaging problems
2005/01/07 15:38:03+01:00 (none)!br1
linux-mtx-1: add patch for kernel mkdep: "argument list to long"
BKrev: 41dead58iTpKCxSeBdN1SdaT26ULLA
| -rw-r--r-- | packages/gpe-nmf/gpe-nmf_0.19.bb | 2 | ||||
| -rw-r--r-- | packages/linux/linux-mtx-1-2.4.27/19-kernel-make-depend.diff | 0 | ||||
| -rw-r--r-- | packages/linux/linux-mtx-1_2.4.27.bb | 1 | ||||
| -rw-r--r-- | packages/perl/perl_5.8.3.bb | 5 |
4 files changed, 5 insertions, 3 deletions
diff --git a/packages/gpe-nmf/gpe-nmf_0.19.bb b/packages/gpe-nmf/gpe-nmf_0.19.bb index 29e75573e6..5728ddc548 100644 --- a/packages/gpe-nmf/gpe-nmf_0.19.bb +++ b/packages/gpe-nmf/gpe-nmf_0.19.bb @@ -3,7 +3,7 @@ inherit gpe pkgconfig DESCRIPTION = "GPE audio player" DEPENDS = "gtk+ libgpewidget gstreamer" -RDEPENDS = "gpe-gst-plugins" +RDEPENDS = "gst-plugins" SECTION = "gpe" PRIORITY = "optional" PR = "r1" diff --git a/packages/linux/linux-mtx-1-2.4.27/19-kernel-make-depend.diff b/packages/linux/linux-mtx-1-2.4.27/19-kernel-make-depend.diff new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/linux/linux-mtx-1-2.4.27/19-kernel-make-depend.diff diff --git a/packages/linux/linux-mtx-1_2.4.27.bb b/packages/linux/linux-mtx-1_2.4.27.bb index af1f5d5490..0e17e7ad24 100644 --- a/packages/linux/linux-mtx-1_2.4.27.bb +++ b/packages/linux/linux-mtx-1_2.4.27.bb @@ -25,6 +25,7 @@ SRC_URI = "cvs://cvs@ftp.linux-mips.org/home/cvs;module=linux;tag=linux_2_4_27 \ file://16-i2c.patch;patch=1 \ file://17-lmsensors.2.8.8.patch;patch=1 \ file://18-i2c-au1x00gpio.patch;patch=1 \ + file://19-kernel-make-depend.diff;patch=1 \ file://defconfig-mtx-1" S = "${WORKDIR}/linux" diff --git a/packages/perl/perl_5.8.3.bb b/packages/perl/perl_5.8.3.bb index b7c6b7f9b0..e82438f169 100644 --- a/packages/perl/perl_5.8.3.bb +++ b/packages/perl/perl_5.8.3.bb @@ -4,7 +4,7 @@ LICENSE = "Artistic|GPL" SECTION = "devel" PRIORITY = "optional" DEPENDS = "db3 perl-native" -PR = "r1" +PR = "r2" SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \ file://Makefile.patch;patch=1 \ @@ -49,9 +49,10 @@ do_stage() { python populate_packages_prepend () { libdir = bb.data.expand('${libdir}/perl5/${PV}', d) archlibdir = bb.data.expand('${libdir}/perl5/${PV}/${TARGET_ARCH}-${TARGET_OS}', d) + do_split_packages(d, archlibdir, 'auto/(.*)/', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True) + do_split_packages(d, archlibdir, '(.*)\.(pm|pl)', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True) do_split_packages(d, libdir, '(.*)\.(pm|pl)', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True) - do_split_packages(d, archlibdir, '(.*)\.(pm|pl)', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True) } PACKAGES = "perl perl-misc perl-lib perl-dev perl-pod" |