mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 20:59:41 +02:00
500e5d2ad5
Refresh patches with devtool command to fix do_patch warning. Drop CVE-2017-9263.patch since it had been fixed upstream. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
151 lines
4.7 KiB
Diff
151 lines
4.7 KiB
Diff
From f21a0490555d5fe8f5a9ce982defa666a64151c0 Mon Sep 17 00:00:00 2001
|
|
From: Mark Asselstine <mark.asselstine@windriver.com>
|
|
Date: Fri, 13 Jan 2017 16:12:55 -0500
|
|
Subject: [PATCH] python: make remaining scripts use /usr/bin/env
|
|
|
|
Unfortunately there is no concept of a host python vs. target python
|
|
to facilitate cross compilation. There is only one PYTHON variable and
|
|
this is used during building and in the header of python scripts after
|
|
installation. The best approach for cross compilation is to thus to
|
|
ensure python is in the path and avoid passing a path as part of
|
|
PYTHON. To make this function smoothly all installed scripts should
|
|
make use of /usr/bin/env to increase the chances of finding python.
|
|
|
|
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
|
|
|
|
---
|
|
build-aux/check-structs | 2 +-
|
|
build-aux/extract-ofp-actions | 2 +-
|
|
build-aux/extract-ofp-errors | 2 +-
|
|
build-aux/extract-ofp-fields | 2 +-
|
|
build-aux/extract-ofp-msgs | 2 +-
|
|
build-aux/xml2nroff | 2 +-
|
|
ovn/utilities/ovn-docker-overlay-driver | 2 +-
|
|
ovn/utilities/ovn-docker-underlay-driver | 2 +-
|
|
ovsdb/ovsdb-doc | 2 +-
|
|
ovsdb/ovsdb-dot.in | 2 +-
|
|
ovsdb/ovsdb-idlc.in | 2 +-
|
|
utilities/bugtool/ovs-bugtool.in | 2 +-
|
|
12 files changed, 12 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/build-aux/check-structs b/build-aux/check-structs
|
|
index f79f235..5129b72 100755
|
|
--- a/build-aux/check-structs
|
|
+++ b/build-aux/check-structs
|
|
@@ -1,4 +1,4 @@
|
|
-#! /usr/bin/python
|
|
+#! /usr/bin/env python3
|
|
|
|
import os.path
|
|
import sys
|
|
diff --git a/build-aux/extract-ofp-actions b/build-aux/extract-ofp-actions
|
|
index 0062ab8..ee8c4ff 100755
|
|
--- a/build-aux/extract-ofp-actions
|
|
+++ b/build-aux/extract-ofp-actions
|
|
@@ -1,4 +1,4 @@
|
|
-#! /usr/bin/python
|
|
+#! /usr/bin/env python3
|
|
|
|
import sys
|
|
import os.path
|
|
diff --git a/build-aux/extract-ofp-errors b/build-aux/extract-ofp-errors
|
|
index 2312b76..e36444e 100755
|
|
--- a/build-aux/extract-ofp-errors
|
|
+++ b/build-aux/extract-ofp-errors
|
|
@@ -1,4 +1,4 @@
|
|
-#! /usr/bin/python
|
|
+#! /usr/bin/env python3
|
|
|
|
import sys
|
|
import os.path
|
|
diff --git a/build-aux/extract-ofp-fields b/build-aux/extract-ofp-fields
|
|
index 498b887..c248e76 100755
|
|
--- a/build-aux/extract-ofp-fields
|
|
+++ b/build-aux/extract-ofp-fields
|
|
@@ -1,4 +1,4 @@
|
|
-#! /usr/bin/python
|
|
+#! /usr/bin/env python3
|
|
|
|
import getopt
|
|
import sys
|
|
diff --git a/build-aux/extract-ofp-msgs b/build-aux/extract-ofp-msgs
|
|
index 1813638..c2a91f9 100755
|
|
--- a/build-aux/extract-ofp-msgs
|
|
+++ b/build-aux/extract-ofp-msgs
|
|
@@ -1,4 +1,4 @@
|
|
-#! /usr/bin/python
|
|
+#! /usr/bin/env python3
|
|
|
|
import sys
|
|
import os.path
|
|
diff --git a/build-aux/xml2nroff b/build-aux/xml2nroff
|
|
index bd4e879..db45c56 100755
|
|
--- a/build-aux/xml2nroff
|
|
+++ b/build-aux/xml2nroff
|
|
@@ -1,4 +1,4 @@
|
|
-#! /usr/bin/python
|
|
+#! /usr/bin/env python3
|
|
|
|
# Copyright (c) 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc.
|
|
#
|
|
diff --git a/ovn/utilities/ovn-docker-overlay-driver b/ovn/utilities/ovn-docker-overlay-driver
|
|
index 52de3db..3b1fa45 100755
|
|
--- a/ovn/utilities/ovn-docker-overlay-driver
|
|
+++ b/ovn/utilities/ovn-docker-overlay-driver
|
|
@@ -1,4 +1,4 @@
|
|
-#! /usr/bin/python
|
|
+#! /usr/bin/env python3
|
|
# Copyright (C) 2015 Nicira, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
diff --git a/ovn/utilities/ovn-docker-underlay-driver b/ovn/utilities/ovn-docker-underlay-driver
|
|
index 2c9c4b6..551e7a1 100755
|
|
--- a/ovn/utilities/ovn-docker-underlay-driver
|
|
+++ b/ovn/utilities/ovn-docker-underlay-driver
|
|
@@ -1,4 +1,4 @@
|
|
-#! /usr/bin/python
|
|
+#! /usr/bin/env python3
|
|
# Copyright (C) 2015 Nicira, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
diff --git a/ovsdb/ovsdb-doc b/ovsdb/ovsdb-doc
|
|
index 5cf26ee..bdf2dcc 100755
|
|
--- a/ovsdb/ovsdb-doc
|
|
+++ b/ovsdb/ovsdb-doc
|
|
@@ -1,4 +1,4 @@
|
|
-#! /usr/bin/python
|
|
+#! /usr/bin/env python3
|
|
|
|
# Copyright (c) 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc.
|
|
#
|
|
diff --git a/ovsdb/ovsdb-dot.in b/ovsdb/ovsdb-dot.in
|
|
index 134ce22..893c408 100755
|
|
--- a/ovsdb/ovsdb-dot.in
|
|
+++ b/ovsdb/ovsdb-dot.in
|
|
@@ -1,4 +1,4 @@
|
|
-#! @PYTHON@
|
|
+#! /usr/bin/env @PYTHON@
|
|
|
|
from datetime import date
|
|
import ovs.db.error
|
|
diff --git a/ovsdb/ovsdb-idlc.in b/ovsdb/ovsdb-idlc.in
|
|
index 721ab50..bfbcf23 100755
|
|
--- a/ovsdb/ovsdb-idlc.in
|
|
+++ b/ovsdb/ovsdb-idlc.in
|
|
@@ -1,4 +1,4 @@
|
|
-#! @PYTHON@
|
|
+#! /usr/bin/env @PYTHON@
|
|
|
|
import getopt
|
|
import os
|
|
diff --git a/utilities/bugtool/ovs-bugtool.in b/utilities/bugtool/ovs-bugtool.in
|
|
index 963c50c..c84d7c2 100755
|
|
--- a/utilities/bugtool/ovs-bugtool.in
|
|
+++ b/utilities/bugtool/ovs-bugtool.in
|
|
@@ -1,4 +1,4 @@
|
|
-#! @PYTHON@
|
|
+#! /usr/bin/env @PYTHON@
|
|
|
|
# This library is free software; you can redistribute it and/or
|
|
# modify it under the terms of version 2.1 of the GNU Lesser General Public
|