[oe-commits] org.oe.dev merge of 'a7a168be197ea3f604669c15d7ec1f26edc2a25c'

[pfalcon commit]

merge of 'a7a168be197ea3f604669c15d7ec1f26edc2a25c'
     and 'f7f1a87db91fd74a3e661901b014f70b0719706e'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: eff8f83fc659dcde86a5dd8e4e1de467cba0c1af
ViewMTN: http://monotone.openembedded.org/revision.psp?id=eff8f83fc659dcde86a5dd8e4e1de467cba0c1af
Files:
1
packages/linux/compulab-pxa270_2.6.16.bb
packages/initrdscripts/initramfs_0.1.bb
packages/initrdscripts/initramfs-uniboot_0.2.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 -ra7a168be197ea3f604669c15d7ec1f26edc2a25c -reff8f83fc659dcde86a5dd8e4e1de467cba0c1af
#
# 
# 
# patch "packages/linux/compulab-pxa270_2.6.16.bb"
#  from [c792b7e8d3021c9d56ee96df4f48cb823b7941e4]
#    to [aa641b64bcb45bd089254790a8c5e4761f3d34cd]
# 
============================================================
--- packages/linux/compulab-pxa270_2.6.16.bb	c792b7e8d3021c9d56ee96df4f48cb823b7941e4
+++ packages/linux/compulab-pxa270_2.6.16.bb	aa641b64bcb45bd089254790a8c5e4761f3d34cd
@@ -66,8 +66,8 @@ do_deploy[dirs] = "${S}"
 
 do_deploy[dirs] = "${S}"
 
-addtask deploy before do_build after do_compile
-addtask compulab_image before do_build after do_deploy
+addtask deploy before do_install after do_compile
+addtask compulab_image before do_install after do_deploy
 
 COMPATIBLE_MACHINE = "compulab-pxa270"
 


#
# mt diff -rf7f1a87db91fd74a3e661901b014f70b0719706e -reff8f83fc659dcde86a5dd8e4e1de467cba0c1af
#
# 
# 
# rename "packages/initrdscripts/initramfs_0.1.bb"
#     to "packages/initrdscripts/initramfs-uniboot_0.2.bb"
# 
# 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/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() {