diff options
author | Nick Kralevich <nnk@google.com> | 2019-02-26 12:06:26 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-02-26 12:06:26 -0800 |
commit | b4b9d8dc9c8d1bc15c4d83b32a0642439295e48d (patch) | |
tree | 535eb8afd81e80be53b38d0db1a046570fc7abd2 | |
parent | f56b22ae19329dbe362ed41fe3d5ca3b1d468c8d (diff) | |
parent | bc47cff9dd474a6d02e0d7a32d03025ab69f2b8e (diff) | |
download | android_external_selinux-b4b9d8dc9c8d1bc15c4d83b32a0642439295e48d.tar.gz android_external_selinux-b4b9d8dc9c8d1bc15c4d83b32a0642439295e48d.tar.bz2 android_external_selinux-b4b9d8dc9c8d1bc15c4d83b32a0642439295e48d.zip |
Merge remote-tracking branch 'aosp/upstream-master' into mymerge am: 65c6846e1a
am: bc47cff9dd
Change-Id: Id58d92dd4071e714a807eb186595c7bd7de2be63
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | dbus/selinux_server.py | 2 | ||||
-rw-r--r-- | libselinux/src/Makefile | 2 | ||||
-rw-r--r-- | libsemanage/src/Makefile | 2 | ||||
-rwxr-xr-x | libsemanage/utils/semanage_migrate_store | 2 | ||||
-rw-r--r-- | mcstrans/share/util/mlscolor-test | 2 | ||||
-rw-r--r-- | mcstrans/share/util/mlstrans-test | 2 | ||||
-rw-r--r-- | python/audit2allow/Makefile | 2 | ||||
-rw-r--r-- | python/semanage/Makefile | 2 | ||||
-rw-r--r-- | python/semanage/semanage | 2 | ||||
-rw-r--r-- | python/sepolgen/src/sepolgen/Makefile | 2 | ||||
-rw-r--r-- | python/sepolgen/tests/Makefile | 2 | ||||
-rw-r--r-- | python/sepolicy/Makefile | 2 | ||||
-rw-r--r-- | sandbox/Makefile | 2 | ||||
-rw-r--r-- | sandbox/start | 2 | ||||
-rwxr-xr-x | scripts/env_use_destdir | 2 | ||||
-rwxr-xr-x | scripts/run-scan-build | 2 |
17 files changed, 17 insertions, 17 deletions
@@ -3,7 +3,7 @@ Subscribe by sending "subscribe selinux" in the body of an email to majordomo@vger.kernel.org. Build dependencies on Fedora: -yum install audit-libs-devel bison bzip2-devel dbus-devel dbus-glib-devel flex flex-devel flex-static glib2-devel libcap-devel libcap-ng-devel pam-devel pcre-devel python-devel setools-devel swig xmlto redhat-rpm-config +yum install audit-libs-devel bison bzip2-devel dbus-devel dbus-glib-devel flex flex-devel flex-static glib2-devel libcap-devel libcap-ng-devel pam-devel pcre-devel python3-devel python3-setools swig xmlto redhat-rpm-config To build and install everything under a private directory, run: make DESTDIR=~/obj install install-pywrap diff --git a/dbus/selinux_server.py b/dbus/selinux_server.py index 6e380e58..98ab53dd 100644 --- a/dbus/selinux_server.py +++ b/dbus/selinux_server.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 import dbus import dbus.service diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile index 92e30738..e9ed0383 100644 --- a/libselinux/src/Makefile +++ b/libselinux/src/Makefile @@ -1,7 +1,7 @@ # Support building the Python bindings multiple times, against various Python # runtimes (e.g. Python 2 vs Python 3) by optionally prefixing the build # targets with "PYPREFIX": -PYTHON ?= python +PYTHON ?= python3 PYPREFIX ?= $(shell $(PYTHON) -c 'import sys;print("python-%d.%d" % sys.version_info[:2])') RUBY ?= ruby RUBYPREFIX ?= $(notdir $(RUBY)) diff --git a/libsemanage/src/Makefile b/libsemanage/src/Makefile index dea751e5..e029f098 100644 --- a/libsemanage/src/Makefile +++ b/libsemanage/src/Makefile @@ -1,7 +1,7 @@ # Support building the Python bindings multiple times, against various Python # runtimes (e.g. Python 2 vs Python 3) by optionally prefixing the build # targets with "PYPREFIX": -PYTHON ?= python +PYTHON ?= python3 PYPREFIX ?= $(shell $(PYTHON) -c 'import sys;print("python-%d.%d" % sys.version_info[:2])') RUBY ?= ruby RUBYPREFIX ?= $(notdir $(RUBY)) diff --git a/libsemanage/utils/semanage_migrate_store b/libsemanage/utils/semanage_migrate_store index 018b1a3e..c6caf3bf 100755 --- a/libsemanage/utils/semanage_migrate_store +++ b/libsemanage/utils/semanage_migrate_store @@ -1,4 +1,4 @@ -#!/usr/bin/python -E +#!/usr/bin/python3 -E from __future__ import print_function diff --git a/mcstrans/share/util/mlscolor-test b/mcstrans/share/util/mlscolor-test index 03fc4be4..240e996d 100644 --- a/mcstrans/share/util/mlscolor-test +++ b/mcstrans/share/util/mlscolor-test @@ -1,4 +1,4 @@ -#!/usr/bin/python -E +#!/usr/bin/python3 -E import sys import selinux diff --git a/mcstrans/share/util/mlstrans-test b/mcstrans/share/util/mlstrans-test index c026d00e..085fa82d 100644 --- a/mcstrans/share/util/mlstrans-test +++ b/mcstrans/share/util/mlstrans-test @@ -1,4 +1,4 @@ -#!/usr/bin/python -E +#!/usr/bin/python3 -E import sys import selinux diff --git a/python/audit2allow/Makefile b/python/audit2allow/Makefile index 18d740d3..15db5490 100644 --- a/python/audit2allow/Makefile +++ b/python/audit2allow/Makefile @@ -1,4 +1,4 @@ -PYTHON ?= python +PYTHON ?= python3 SECILC ?= secilc # Installation directories. diff --git a/python/semanage/Makefile b/python/semanage/Makefile index 37065268..024e9640 100644 --- a/python/semanage/Makefile +++ b/python/semanage/Makefile @@ -1,4 +1,4 @@ -PYTHON ?= python +PYTHON ?= python3 # Installation directories. LINGUAS ?= ru diff --git a/python/semanage/semanage b/python/semanage/semanage index d6d68248..144cc000 100644 --- a/python/semanage/semanage +++ b/python/semanage/semanage @@ -1,4 +1,4 @@ -#! /usr/bin/python3 -Es +#!/usr/bin/python3 -Es # Copyright (C) 2012-2013 Red Hat # AUTHOR: Miroslav Grepl <mgrepl@redhat.com> # AUTHOR: David Quigley <selinux@davequigley.com> diff --git a/python/sepolgen/src/sepolgen/Makefile b/python/sepolgen/src/sepolgen/Makefile index c75809ad..cac8def7 100644 --- a/python/sepolgen/src/sepolgen/Makefile +++ b/python/sepolgen/src/sepolgen/Makefile @@ -1,5 +1,5 @@ PREFIX ?= /usr -PYTHON ?= python +PYTHON ?= python3 PYTHONLIBDIR ?= $(shell $(PYTHON) -c "from distutils.sysconfig import *; print(get_python_lib(prefix='$(PREFIX)'))") PACKAGEDIR ?= /$(PYTHONLIBDIR)/sepolgen diff --git a/python/sepolgen/tests/Makefile b/python/sepolgen/tests/Makefile index e17eef22..83d072f4 100644 --- a/python/sepolgen/tests/Makefile +++ b/python/sepolgen/tests/Makefile @@ -1,4 +1,4 @@ -PYTHON ?= python +PYTHON ?= python3 clean: rm -f *~ *.pyc diff --git a/python/sepolicy/Makefile b/python/sepolicy/Makefile index 7ed039bc..69f29fa9 100644 --- a/python/sepolicy/Makefile +++ b/python/sepolicy/Makefile @@ -1,4 +1,4 @@ -PYTHON ?= python +PYTHON ?= python3 # Installation directories. LINGUAS ?= ru diff --git a/sandbox/Makefile b/sandbox/Makefile index 862bffbe..9da5e58d 100644 --- a/sandbox/Makefile +++ b/sandbox/Makefile @@ -1,4 +1,4 @@ -PYTHON ?= python +PYTHON ?= python3 # Installation directories. LINGUAS ?= ru diff --git a/sandbox/start b/sandbox/start index 7f83532f..4ed3cb5c 100644 --- a/sandbox/start +++ b/sandbox/start @@ -1,4 +1,4 @@ -#! /usr/bin/python -Es +#!/usr/bin/python3 -Es try: from subprocess import getstatusoutput except ImportError: diff --git a/scripts/env_use_destdir b/scripts/env_use_destdir index 4fbfb8de..251987c2 100755 --- a/scripts/env_use_destdir +++ b/scripts/env_use_destdir @@ -25,7 +25,7 @@ export LD_LIBRARY_PATH="$DESTDIR/usr/lib:$DESTDIR/lib" export PATH="$DESTDIR/usr/sbin:$DESTDIR/usr/bin:$DESTDIR/sbin:$DESTDIR/bin:$PATH" # shellcheck disable=SC2155 -export PYTHONPATH="$DESTDIR$(${PYTHON:-python} -c "from distutils.sysconfig import *;print(get_python_lib(prefix='/usr'))")" +export PYTHONPATH="$DESTDIR$(${PYTHON:-python3} -c "from distutils.sysconfig import *;print(get_python_lib(prefix='/usr'))")" # shellcheck disable=SC2155 export RUBYLIB="$DESTDIR/$(${RUBY:-ruby} -e 'puts RbConfig::CONFIG["vendorlibdir"]'):$DESTDIR/$(${RUBY:-ruby} -e 'puts RbConfig::CONFIG["vendorarchdir"]')" diff --git a/scripts/run-scan-build b/scripts/run-scan-build index 8b24a4d0..88fe551c 100755 --- a/scripts/run-scan-build +++ b/scripts/run-scan-build @@ -17,7 +17,7 @@ fi # Make sure to use the newly-installed libraries when running tests export LD_LIBRARY_PATH="$DESTDIR/usr/lib:$DESTDIR/lib" export PATH="$DESTDIR/usr/sbin:$DESTDIR/usr/bin:$DESTDIR/sbin:$DESTDIR/bin:$PATH" -export PYTHONPATH="$DESTDIR$(${PYTHON:-python} -c "from distutils.sysconfig import *;print(get_python_lib(prefix='/usr'))")" +export PYTHONPATH="$DESTDIR$(${PYTHON:-python3} -c "from distutils.sysconfig import *;print(get_python_lib(prefix='/usr'))")" export RUBYLIB="$DESTDIR/$(${RUBY:-ruby} -e 'puts RbConfig::CONFIG["vendorlibdir"]'):$DESTDIR/$(${RUBY:-ruby} -e 'puts RbConfig::CONFIG["vendorarchdir"]')" # Build and analyze |