Patchwork [5/5] nss: fix incorrect shebang line of perl script

login
register
mail settings
Submitter Hongxu Jia
Date July 10, 2013, 8:03 a.m.
Message ID <5891c95b244f3b0ad5e54bcb7595fc401c1727f3.1373443071.git.hongxu.jia@windriver.com>
Download mbox | patch
Permalink /patch/53441/
State New
Headers show

Comments

Hongxu Jia - July 10, 2013, 8:03 a.m.
Replace incorrect shebang line with `#!/usr/bin/perl'.

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 .../files/nss-fix-incorrect-shebang-of-perl.patch  | 110 +++++++++++++++++++++
 meta/recipes-support/nss/nss.inc                   |   1 +
 2 files changed, 111 insertions(+)
 create mode 100644 meta/recipes-support/nss/files/nss-fix-incorrect-shebang-of-perl.patch
Trevor Woerner - July 11, 2013, 8:39 a.m.
On 10 July 2013 09:03, Hongxu Jia <hongxu.jia@windriver.com> wrote:
> Replace incorrect shebang line with `#!/usr/bin/perl'.


I thought using 'env' was the preferred method?
Hongxu Jia - July 11, 2013, 8:58 a.m.
On 07/11/2013 04:39 PM, Trevor Woerner wrote:
> On 10 July 2013 09:03, Hongxu Jia <hongxu.jia@windriver.com> wrote:
>> Replace incorrect shebang line with `#!/usr/bin/perl'.
>
> I thought using 'env' was the preferred method?
If use 'env', should we add 'coreutils' on nss's DEPENDS?
The coreutils provides env.

//Hongxu
Paul Eggleton - July 11, 2013, 9:23 a.m.
On Thursday 11 July 2013 16:58:15 Hongxu Jia wrote:
> On 07/11/2013 04:39 PM, Trevor Woerner wrote:
> > On 10 July 2013 09:03, Hongxu Jia <hongxu.jia@windriver.com> wrote:
> >> Replace incorrect shebang line with `#!/usr/bin/perl'.
> > 
> > I thought using 'env' was the preferred method?
> 
> If use 'env', should we add 'coreutils' on nss's DEPENDS?
> The coreutils provides env.

Our busybox configuration enables its version of env as well. I think it's 
pretty safe to assume this is available without the need for additional 
dependencies.

Cheers,
Paul
Hongxu Jia - July 11, 2013, 9:28 a.m.
On 07/11/2013 05:23 PM, Paul Eggleton wrote:
> On Thursday 11 July 2013 16:58:15 Hongxu Jia wrote:
>> On 07/11/2013 04:39 PM, Trevor Woerner wrote:
>>> On 10 July 2013 09:03, Hongxu Jia <hongxu.jia@windriver.com> wrote:
>>>> Replace incorrect shebang line with `#!/usr/bin/perl'.
>>> I thought using 'env' was the preferred method?
>> If use 'env', should we add 'coreutils' on nss's DEPENDS?
>> The coreutils provides env.
> Our busybox configuration enables its version of env as well. I think it's
> pretty safe to assume this is available without the need for additional
> dependencies.
Got it, use 'env' and without additional dependencies, I will fix this.

Thanks
Hongxu
> Cheers,
> Paul
>

Patch

diff --git a/meta/recipes-support/nss/files/nss-fix-incorrect-shebang-of-perl.patch b/meta/recipes-support/nss/files/nss-fix-incorrect-shebang-of-perl.patch
new file mode 100644
index 0000000..ae2a6e5
--- /dev/null
+++ b/meta/recipes-support/nss/files/nss-fix-incorrect-shebang-of-perl.patch
@@ -0,0 +1,110 @@ 
+nss: fix incorrect shebang of perl
+
+Replace incorrect shebang of perl with `#!/usr/bin/perl'.
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+Upstream-Status: Pending
+---
+ nss/cmd/smimetools/smime  | 2 +-
+ nss/coreconf/cpdist.pl    | 2 +-
+ nss/coreconf/import.pl    | 2 +-
+ nss/coreconf/jniregen.pl  | 2 +-
+ nss/coreconf/outofdate.pl | 2 +-
+ nss/coreconf/release.pl   | 2 +-
+ nss/coreconf/version.pl   | 2 +-
+ nss/tests/clean_tbx       | 2 +-
+ nss/tests/path_uniq       | 2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/nss/cmd/smimetools/smime b/nss/cmd/smimetools/smime
+--- a/nss/cmd/smimetools/smime
++++ b/nss/cmd/smimetools/smime
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ 
+ # This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+diff --git a/nss/coreconf/cpdist.pl b/nss/coreconf/cpdist.pl
+index 800edfb..652187f 100755
+--- a/nss/coreconf/cpdist.pl
++++ b/nss/coreconf/cpdist.pl
+@@ -1,4 +1,4 @@
+-#! /usr/local/bin/perl
++#!/usr/bin/perl
+ #
+ # This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+diff --git a/nss/coreconf/import.pl b/nss/coreconf/import.pl
+index dd2d177..428eaa5 100755
+--- a/nss/coreconf/import.pl
++++ b/nss/coreconf/import.pl
+@@ -1,4 +1,4 @@
+-#! /usr/local/bin/perl
++#!/usr/bin/perl
+ #
+ # This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+diff --git a/nss/coreconf/jniregen.pl b/nss/coreconf/jniregen.pl
+index 2039180..5f4f69c 100755
+--- a/nss/coreconf/jniregen.pl
++++ b/nss/coreconf/jniregen.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ #
+ # This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+diff --git a/nss/coreconf/outofdate.pl b/nss/coreconf/outofdate.pl
+index 33d80bb..01fc097 100755
+--- a/nss/coreconf/outofdate.pl
++++ b/nss/coreconf/outofdate.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#!/usr/bin/perl
+ #
+ # This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+diff --git a/nss/coreconf/release.pl b/nss/coreconf/release.pl
+index 7cde19d..b5df2f6 100755
+--- a/nss/coreconf/release.pl
++++ b/nss/coreconf/release.pl
+@@ -1,4 +1,4 @@
+-#! /usr/local/bin/perl
++#!/usr/bin/perl
+ #
+ # This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+diff --git a/nss/coreconf/version.pl b/nss/coreconf/version.pl
+index d2a4942..79359fe 100644
+--- a/nss/coreconf/version.pl
++++ b/nss/coreconf/version.pl
+@@ -1,4 +1,4 @@
+-#!/usr/sbin/perl
++#!/usr/bin/perl
+ #
+ # This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+diff --git a/nss/tests/clean_tbx b/nss/tests/clean_tbx
+index 4de9555..a7def9f 100755
+--- a/nss/tests/clean_tbx
++++ b/nss/tests/clean_tbx
+@@ -1,4 +1,4 @@
+-#! /bin/perl
++#!/usr/bin/perl
+ 
+ #######################################################################
+ #
+diff --git a/nss/tests/path_uniq b/nss/tests/path_uniq
+index f29f60a..08fbffa 100755
+--- a/nss/tests/path_uniq
++++ b/nss/tests/path_uniq
+@@ -1,4 +1,4 @@
+-#! /bin/perl
++#!/usr/bin/perl
+ 
+ ########################################################################
+ #
+-- 
+1.8.1.2
+
diff --git a/meta/recipes-support/nss/nss.inc b/meta/recipes-support/nss/nss.inc
index 4270743..e2f3891 100644
--- a/meta/recipes-support/nss/nss.inc
+++ b/meta/recipes-support/nss/nss.inc
@@ -15,6 +15,7 @@  LIC_FILES_CHKSUM = "file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466a
 SRC_URI = "\
     file://nss-fix-support-cross-compiling.patch \
     file://nss-no-rpath-for-cross-compiling.patch \
+    file://nss-fix-incorrect-shebang-of-perl.patch \
 "
 SRC_URI_append_class-target += "\
     file://nss.pc.in \