[oe-commits] org.oe.dev merge of '8d1228f600311d595e28d93dbd659249596b54c0'

todd commit openembedded-commits at lists.openembedded.org
Sat Jul 21 11:59:37 UTC 2007


merge of '8d1228f600311d595e28d93dbd659249596b54c0'
     and '9232e3b36eb813d12d27e731841b2bad5b639846'

Author: todd at sdgsystems.com
Branch: org.openembedded.dev
Revision: 487224916abe23cfcf9d82e4300db8963d2ae5f8
ViewMTN: http://monotone.openembedded.org/revision.psp?id=487224916abe23cfcf9d82e4300db8963d2ae5f8
Files:
1
packages/initrdscripts/initramfs_0.1.bb
packages/initrdscripts/initramfs-uniboot_0.2.bb
packages/brutefir/brutefir_1.0i.bb
packages/initrdscripts/initramfs-module-block_0.1.bb
packages/initrdscripts/initramfs-module-loop_0.1.bb
packages/initrdscripts/initramfs-module-nfs_0.1.bb
Diffs:

#
# mt diff -r8d1228f600311d595e28d93dbd659249596b54c0 -r487224916abe23cfcf9d82e4300db8963d2ae5f8
#
# 
# no changes
# 


#
# mt diff -r9232e3b36eb813d12d27e731841b2bad5b639846 -r487224916abe23cfcf9d82e4300db8963d2ae5f8
#
# 
# 
# rename "packages/initrdscripts/initramfs_0.1.bb"
#     to "packages/initrdscripts/initramfs-uniboot_0.2.bb"
# 
# patch "packages/brutefir/brutefir_1.0i.bb"
#  from [4e6a79d2de11dc1028ecfa918680d04c02ddba18]
#    to [e02d07dc7527439ee60d4c2ec25ba9b3d2df741b]
# 
# patch "packages/initrdscripts/initramfs-module-block_0.1.bb"
#  from [f1c3b5fb4719b0a4198a9321b3a6597b16723df6]
#    to [506cedb83f5ba312f8f4a1a21d4261aee9a4b661]
# 
# patch "packages/initrdscripts/initramfs-module-loop_0.1.bb"
#  from [4e72e934fd0cd05c39972580650a8dc4fa1db959]
#    to [059299818279ed5cf15ee036428984466bf1095b]
# 
# patch "packages/initrdscripts/initramfs-module-nfs_0.1.bb"
#  from [2ac7a7ca8fdbb75b8bb837240874654e69cae292]
#    to [a2dd01c80a8348aedad1614f86d21641e971fb25]
# 
============================================================
--- packages/brutefir/brutefir_1.0i.bb	4e6a79d2de11dc1028ecfa918680d04c02ddba18
+++ packages/brutefir/brutefir_1.0i.bb	e02d07dc7527439ee60d4c2ec25ba9b3d2df741b
@@ -1,8 +1,10 @@ LICENSE = "GPLv2"
 DESCRIPTION = "BruteFIR is a software convolution engine, a program for applying long FIR filters to multi-channel digital audio, either offline or in realtime."
 LICENSE = "GPLv2"
 
-DEPENDS = "fftw"
+DEPENDS = "fftw fftwf fftwl"
 
+PR = "r1"
+
 # The unbreak-makefile disables the SSE2, MMX and jack support, feel free 
 # to add back SSE and MMX after fixing the makefile to not use uname to check for cpu 
 
============================================================
--- packages/initrdscripts/initramfs-module-block_0.1.bb	f1c3b5fb4719b0a4198a9321b3a6597b16723df6
+++ packages/initrdscripts/initramfs-module-block_0.1.bb	506cedb83f5ba312f8f4a1a21d4261aee9a4b661
@@ -1,6 +1,6 @@ SRC_URI = "file://blockboot.sh"
 SRC_URI = "file://blockboot.sh"
-PR = "r0"
-RDEPENDS = "initramfs"
+PR = "r1"
+RDEPENDS = "initramfs-uniboot"
 DESCRIPTION = "An initramfs module for booting off normal block devices."
 
 do_install() {
============================================================
--- packages/initrdscripts/initramfs-module-loop_0.1.bb	4e72e934fd0cd05c39972580650a8dc4fa1db959
+++ packages/initrdscripts/initramfs-module-loop_0.1.bb	059299818279ed5cf15ee036428984466bf1095b
@@ -1,8 +1,8 @@ SRC_URI = "file://loopboot.sh"
 SRC_URI = "file://loopboot.sh"
-PR = "r1"
+PR = "r2"
 DESCRIPTION = "An initramfs module for booting a filesystem image by loopback \
                mounting it."
-RDEPENDS = "initramfs"
+RDEPENDS = "initramfs-uniboot"
 RRECOMMENDS = "kernel-module-loop kernel-module-vfat"
 
 do_install() {
============================================================
--- packages/initrdscripts/initramfs-module-nfs_0.1.bb	2ac7a7ca8fdbb75b8bb837240874654e69cae292
+++ packages/initrdscripts/initramfs-module-nfs_0.1.bb	a2dd01c80a8348aedad1614f86d21641e971fb25
@@ -1,7 +1,7 @@ SRC_URI = "file://nfsboot.sh"
 SRC_URI = "file://nfsboot.sh"
-PR = "r2"
+PR = "r3"
 DESCRIPTION = "An initramfs module for booting via NFS."
-RDEPENDS = "initramfs"
+RDEPENDS = "initramfs-uniboot"
 RRECOMMENDS = "kernel-module-g-ether kernel-module-nfs"
 
 do_install() {






More information about the Openembedded-commits mailing list