Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

android-tools: Fix inconsistency between selinux configurations #866

Open
wants to merge 3 commits into
base: scarthgap
Choose a base branch
from

Conversation

quic-raghuvar
Copy link
Contributor

ConditionPathExists is set to /etc/usb-debugging-enabled as part of meta-oe/ recipes-devtools/android-tools/android-tools/android-tools-adbd.service file. However, in meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/ android-tools/android-tools-adbd.service file ConditionPathExists is set to /var/usb-debugging-enabled

This causes an internal inconsistency between selinux-enabled and -disabled configurations.

Hence, change ConditionPathExists=/var/usb-debugging-enabled to ConditionPathExists=/etc/usb-debugging-enabled

Reported-by: Dmitry Baryshkov dmitry.baryshkov@linaro.org

@lumag
Copy link
Contributor

lumag commented Sep 2, 2024

  • No DCO trailer
  • Author is incorrect

I hoped that mentioning it once should be enough.

@lumag
Copy link
Contributor

lumag commented Sep 2, 2024

Not to mention that there is no inconsistency before #862 gets merged. This commit should be a part of that pull request rather than a separate one.

@quic-raghuvar
Copy link
Contributor Author

@lumag Do you want me to mention both Reported-by And Signed-off-by?

@lumag
Copy link
Contributor

lumag commented Sep 2, 2024

@quic-raghuvar huh? Reported-by is for me reporting the issue. Signed-off-by shows another fact about the patch author. Have you read what does it actually mean?

ConditionPathExists is set to /etc/usb-debugging-enabled as part of meta-oe/
recipes-devtools/android-tools/android-tools/android-tools-adbd.service file.
However, in meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/
android-tools/android-tools-adbd.service file ConditionPathExists is set to
/var/usb-debugging-enabled

This causes an internal inconsistency between selinux-enabled and -disabled
configurations.

Hence, change ConditionPathExists=/var/usb-debugging-enabled to
ConditionPathExists=/etc/usb-debugging-enabled

Reported-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>

Signed-off-by: Raghuvarya S <quic_raghuvar@quicinc.com>
@lumag
Copy link
Contributor

lumag commented Sep 2, 2024

And the Author field is an internal git metadata. Due to .git misconfiguration on your side you have your account name written there. Please make sure to fix the configuration on your side then use a special argument of git commit to reset author's name.

If you are using the GitHub's web interface, please stop doing that. It might end up in different kinds of the issues, incuding, but not limited to metadata, whitespaces, etc. And by using web interface you are not testing your changes.

@lumag
Copy link
Contributor

lumag commented Sep 2, 2024

  • author is still incorrect
  • no empty lines between tags

You didn't answer. Have you read what does Signed-off-by signify?

@quic-raghuvar
Copy link
Contributor Author

Some sources mentioned to add signed-off-by for DCO.

@lumag
Copy link
Contributor

lumag commented Sep 2, 2024

What is DCO? You didn't add it beforehand, that's why I'm trying to make sure that you understand it.

ConditionPathExists is set to /etc/usb-debugging-enabled as part of meta-oe/
recipes-devtools/android-tools/android-tools/android-tools-adbd.service file.
However, in meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/
android-tools/android-tools-adbd.service file ConditionPathExists is set to
/var/usb-debugging-enabled

This causes an internal inconsistency between selinux-enabled and -disabled
configurations.

Hence, change ConditionPathExists=/var/usb-debugging-enabled to
ConditionPathExists=/etc/usb-debugging-enabled

Reported-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Raghuvarya S <quic_raghuvar@quicinc.com>
@quic-raghuvar
Copy link
Contributor Author

Okay. I uploaded a new commit with no line space between tags. Also, I guess it got merged hence, turned out to be a new commit.

@lumag
Copy link
Contributor

lumag commented Sep 2, 2024

No, it wasn't merged. Please use git commit --amend and force-pushes.

@lumag
Copy link
Contributor

lumag commented Sep 13, 2024

@quic-raghuvar any updates for these patches? This can not be merged as it is now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants