Fix mkyaffs2image call to add a '/' to the mount point
PATCH 1/1 Fix mkyaffs2image call to add a '/' to the mount point
From: Joshua Brindle <[email protected]>
selabel_lookup requires the mountpoint start with a '/' to match specifications in the file_context file. Change mkyaffs2image call to add a '/' to the mount point argument
Change-Id: I255b661822401f9253ef58a2a4bdada85fc96b23
--- tools/releasetools/build_image.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/releasetools/build_image.py +1 -1
@@ -56,7 +56,7 @@ def BuildImage(in_dir, prop_dict, out_file): build_command.append(out_file) if "selinux_fc" in prop_dict: build_command.append(prop_dict["selinux_fc"]) - build_command.append(prop_dict["mount_point"]) + build_command.append("/%s" % prop_dict["mount_point"]) print "Running: ", " ".join(build_command) p = subprocess.Popen(build_command);
Signature · 7 lines
1.7.9.5 -- This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
Note, I have no idea why this just started happening but it is consistent on my 4.1.1_r3 checkout. I don't know what the ramifications of changing the mountpoint are (e.g., is that used by something other than selabel_lookup?) so I haven't submitted it to AOSP.
Quoted 16 lines · Joshua Brindle
From: Joshua Brindle<[email protected]>
selabel_lookuprequires the mountpoint start with a '/' to match specifications in thefile_contextfile. Change mkyaffs2image call to add a '/' to the mount point argumentChange-Id: I255b661822401f9253ef58a2a4bdada85fc96b23
Signed-off-by Joshua Brindle<[email protected]>--- tools/releasetools/build_image.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/releasetools/build_image.py +0
-0
tools/releasetools/build_image.py def BuildImage(in_dir, prop_dict, out_file): · line 62
Quoted 8 lines
tools/releasetools/build_image.py +1
-1@@ -56,7 +56,7 @@ def BuildImage(in_dir, prop_dict, out_file): build_command.append(out_file) if "selinux_fc" in prop_dict: build_command.append(prop_dict["selinux_fc"]) - build_command.append(prop_dict["mount_point"]) + build_command.append("/%s" % prop_dict["mount_point"]) print "Running: ", " ".join(build_command) p = subprocess.Popen(build_command);
--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
There has already been a patch merged with the master branch (external/yaffs2 bd009e4d493deaf90c38da1cdbaa1db69db073ba). For now I would cherry-pick. I'll see what we can do about getting that patch applied to the other branches as well.
Quoted 42 lines · Joshua Brindle
Note, I have no idea why this just started happening but it is consistent on my 4.1.1_r3 checkout. I don't know what the ramifications of changing the mountpoint are (e.g., is that used by something other than
selabel_lookup?) so I haven't submitted it to AOSP.Quoted 20 lines · Joshua Brindle
From: Joshua Brindle<[email protected]>
selabel_lookuprequires the mountpoint start with a '/' to match specifications in thefile_contextfile. Change mkyaffs2image call to add a '/' to the mount point argumentChange-Id: I255b661822401f9253ef58a2a4bda**da85fc96b23
Signed-off-by Joshua Brindle<[email protected]>--- tools/releasetools/build_**image.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/releasetools/build_**image.py +0
-0tools/releasetools/build_**image.py def BuildImage(in_dir, prop_dict, out_file): · line 62
Quoted 8 lines
tools/releasetools/build_**image.py +1
-1@@ -56,7 +56,7 @@ def BuildImage(in_dir, prop_dict, out_file): build_command.append(out_file) if "selinux_fc" in prop_dict: build_command.append(prop_**dict["selinux_fc"]) - build_command.append(prop_**dict["mount_point"]) + build_command.append("/%s" % prop_dict["mount_point"]) print "Running: ", " ".join(build_command) p = subprocess.Popen(build_**command);--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] the words "unsubscribe selinux" without quotes as the message.
Quoted 4 lines · Robert Craig
There has already been a patch merged with the master branch (external/yaffs2
bd009e4d493deaf90c38da1cdbaa1db69db073ba). For now I would cherry-pick. I'll see what we can do about getting that patch applied to the other branches as well.
I cherry-picked it over to seandroid-4.1.1. I assume it isn't needed on 4.0.4 (and it didn't apply cleanly there).
Quoted 53 lines
On Wed, Aug 1, 2012 at 10:39 PM, Joshua Brindle <[email protected]> wrote:
Note, I have no idea why this just started happening but it is consistent on my 4.1.1_r3 checkout. I don't know what the ramifications of changing the mountpoint are (e.g., is that used by something other thanselabel_lookup?) so I haven't submitted it to AOSP.Joshua Brindle wrote:
From: Joshua Brindle<[email protected]>
selabel_lookuprequires the mountpoint start with a '/' to match specifications in thefile_contextfile. Change mkyaffs2image call to add a '/' to the mount point argumentChange-Id: I255b661822401f9253ef58a2a4bdada85fc96b23
Signed-off-by Joshua Brindle<[email protected]>---
tools/releasetools/build_image.py| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)diff --git
a/tools/releasetools/build_image.pyb/tools/releasetools/build_image.py
index a615d1a..610e634 100755
---a/tools/releasetools/build_image.py+++b/tools/releasetools/build_image.py
@@ -56,7 +56,7 @@ defBuildImage(in_dir, prop_dict, out_file):
build_command.append(out_file)
if "selinux_fc" inprop_dict:
build_command.append(prop_dict["selinux_fc"])
-build_command.append(prop_dict["mount_point"])
+ build_command.append("/%s" %
prop_dict["mount_point"])print "Running: ", " ".join(build_command) p =
subprocess.Popen(build_command);--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to [email protected] with
the words "unsubscribe selinux" without quotes as the message.
Signature · 8 lines
Stephen Smalley National Security Agency -- This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.