Patchwork [4/4] Fix installation of socketcand

login
register
mail settings
Submitter Maxime Ripard
Date April 3, 2012, 8:55 a.m.
Message ID <6ba987689f0509f25ac5fdffc3365c9287e97b92.1333443312.git.maxime.ripard@free-electrons.com>
Download mbox | patch
Permalink /patch/150350/
State Not Applicable
Headers show

Comments

Maxime Ripard - April 3, 2012, 8:55 a.m.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 .../socketcand-replace-cp-by-install.patch         |   25 ++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)
 create mode 100644 package/socketcand/socketcand-replace-cp-by-install.patch
Yegor Yefremov - April 3, 2012, 9:05 a.m.
On Tue, Apr 3, 2012 at 10:55 AM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
>  .../socketcand-replace-cp-by-install.patch         |   25 ++++++++++++++++++++
>  1 files changed, 25 insertions(+), 0 deletions(-)
>  create mode 100644 package/socketcand/socketcand-replace-cp-by-install.patch
>
> diff --git a/package/socketcand/socketcand-replace-cp-by-install.patch b/package/socketcand/socketcand-replace-cp-by-install.patch
> new file mode 100644
> index 0000000..d66ed71
> --- /dev/null
> +++ b/package/socketcand/socketcand-replace-cp-by-install.patch
> @@ -0,0 +1,25 @@
> +From 9d2797ce08034aba0087e6fe45873c3ccd8db489 Mon Sep 17 00:00:00 2001
> +From: Maxime Ripard <maxime.ripard@free-electrons.com>
> +Date: Tue, 3 Apr 2012 10:35:09 +0200
> +Subject: [PATCH] Remove cp -n which might not exist on old system and rely on install instead
> +
> +Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> +---
> + Makefile.in |    2 +-
> + 1 files changed, 1 insertions(+), 1 deletions(-)
> +
> +diff --git a/Makefile.in b/Makefile.in
> +index 40d8193..290a8dd 100644
> +--- a/Makefile.in
> ++++ b/Makefile.in
> +@@ -38,6 +38,6 @@ install: socketcand
> +       mkdir -p $(DESTDIR)$(sysroot)$(mandir)
> +       cp $(srcdir)/socketcand.1 $(DESTDIR)$(sysroot)$(mandir)/
> +       mkdir -p $(DESTDIR)$(sysroot)/etc/
> +-      cp -n $(srcdir)/etc/socketcand.conf $(DESTDIR)$(sysroot)/etc/
> ++      install -D $(srcdir)/etc/socketcand.conf $(DESTDIR)$(sysroot)/etc/
> +       if [ $(init_script) = yes ]; then mkdir -p $(DESTDIR)$(sysroot)/etc/init.d; install --mode=755 $(srcdir)/init.d/socketcand $(DESTDIR)$(sysroot)/etc/init.d/socketcand; fi
> +       if [ $(rc_script) = yes ]; then install --mode=755 $(srcdir)/rc.d/socketcand $(DESTDIR)$(sysroot)/etc/rc.d/socketcand; fi
> +--
> +1.7.4.1
> +
> --
> 1.7.5.4

I've forwarded the patch to the maintainer. Let us apply it by now.

Yegor
Peter Korsgaard - April 3, 2012, 9:05 p.m.
>>>>> "Maxime" == Maxime Ripard <maxime.ripard@free-electrons.com> writes:

 Maxime> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
 Maxime> ---
 Maxime>  .../socketcand-replace-cp-by-install.patch         |   25 ++++++++++++++++++++
 Maxime>  1 files changed, 25 insertions(+), 0 deletions(-)
 Maxime>  create mode 100644 package/socketcand/socketcand-replace-cp-by-install.patch

 Maxime> diff --git a/package/socketcand/socketcand-replace-cp-by-install.patch b/package/socketcand/socketcand-replace-cp-by-install.patch
 Maxime> new file mode 100644
 Maxime> index 0000000..d66ed71
 Maxime> --- /dev/null
 Maxime> +++ b/package/socketcand/socketcand-replace-cp-by-install.patch
 Maxime> @@ -0,0 +1,25 @@
 Maxime> +From 9d2797ce08034aba0087e6fe45873c3ccd8db489 Mon Sep 17 00:00:00 2001
 Maxime> +From: Maxime Ripard <maxime.ripard@free-electrons.com>
 Maxime> +Date: Tue, 3 Apr 2012 10:35:09 +0200
 Maxime> +Subject: [PATCH] Remove cp -n which might not exist on old system and rely on install instead
 Maxime> +
 Maxime> +Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
 Maxime> +---
 Maxime> + Makefile.in |    2 +-
 Maxime> + 1 files changed, 1 insertions(+), 1 deletions(-)
 Maxime> +
 Maxime> +diff --git a/Makefile.in b/Makefile.in
 Maxime> +index 40d8193..290a8dd 100644
 Maxime> +--- a/Makefile.in
 Maxime> ++++ b/Makefile.in
 Maxime> +@@ -38,6 +38,6 @@ install: socketcand
 Maxime> + 	mkdir -p $(DESTDIR)$(sysroot)$(mandir)
 Maxime> + 	cp $(srcdir)/socketcand.1 $(DESTDIR)$(sysroot)$(mandir)/
 Maxime> + 	mkdir -p $(DESTDIR)$(sysroot)/etc/
 Maxime> +-	cp -n $(srcdir)/etc/socketcand.conf $(DESTDIR)$(sysroot)/etc/
 Maxime> ++	install -D $(srcdir)/etc/socketcand.conf $(DESTDIR)$(sysroot)/etc/

install -D requires you to pass the full destination file name, but as
we have a mkdir -p ../etc just above, we can drop the -D option. It
would be good to add -m 0644 to not get the configuration file
executable though, so I adjusted the patch to do that.

Committed with that change, thanks.

Patch

diff --git a/package/socketcand/socketcand-replace-cp-by-install.patch b/package/socketcand/socketcand-replace-cp-by-install.patch
new file mode 100644
index 0000000..d66ed71
--- /dev/null
+++ b/package/socketcand/socketcand-replace-cp-by-install.patch
@@ -0,0 +1,25 @@ 
+From 9d2797ce08034aba0087e6fe45873c3ccd8db489 Mon Sep 17 00:00:00 2001
+From: Maxime Ripard <maxime.ripard@free-electrons.com>
+Date: Tue, 3 Apr 2012 10:35:09 +0200
+Subject: [PATCH] Remove cp -n which might not exist on old system and rely on install instead
+
+Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+---
+ Makefile.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 40d8193..290a8dd 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -38,6 +38,6 @@ install: socketcand
+ 	mkdir -p $(DESTDIR)$(sysroot)$(mandir)
+ 	cp $(srcdir)/socketcand.1 $(DESTDIR)$(sysroot)$(mandir)/
+ 	mkdir -p $(DESTDIR)$(sysroot)/etc/
+-	cp -n $(srcdir)/etc/socketcand.conf $(DESTDIR)$(sysroot)/etc/
++	install -D $(srcdir)/etc/socketcand.conf $(DESTDIR)$(sysroot)/etc/
+ 	if [ $(init_script) = yes ]; then mkdir -p $(DESTDIR)$(sysroot)/etc/init.d; install --mode=755 $(srcdir)/init.d/socketcand $(DESTDIR)$(sysroot)/etc/init.d/socketcand; fi
+ 	if [ $(rc_script) = yes ]; then install --mode=755 $(srcdir)/rc.d/socketcand $(DESTDIR)$(sysroot)/etc/rc.d/socketcand; fi
+-- 
+1.7.4.1
+