Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/2] setserial: Rename patches to add sequence numbers
@ 2014-09-04 11:18 Vicente Olivert Riera
  2014-09-04 11:18 ` [Buildroot] [PATCH 2/2] setserial: Disable manpages Vicente Olivert Riera
  2014-09-04 15:21 ` [Buildroot] [PATCH 1/2] setserial: Rename patches to add sequence numbers Peter Korsgaard
  0 siblings, 2 replies; 6+ messages in thread
From: Vicente Olivert Riera @ 2014-09-04 11:18 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Reviewed-by: Markos Chandras <Markos.Chandras@imgtec.com>
---
 ...patch => setserial-0001-build-system-fix.patch} |    0
 ...> setserial-0002-tiocghayesesp-build-fix.patch} |    0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename package/setserial/{setserial-2.17-build-system-fix.patch => setserial-0001-build-system-fix.patch} (100%)
 rename package/setserial/{setserial-2.17-tiocghayesesp-build-fix.patch => setserial-0002-tiocghayesesp-build-fix.patch} (100%)

diff --git a/package/setserial/setserial-2.17-build-system-fix.patch b/package/setserial/setserial-0001-build-system-fix.patch
similarity index 100%
rename from package/setserial/setserial-2.17-build-system-fix.patch
rename to package/setserial/setserial-0001-build-system-fix.patch
diff --git a/package/setserial/setserial-2.17-tiocghayesesp-build-fix.patch b/package/setserial/setserial-0002-tiocghayesesp-build-fix.patch
similarity index 100%
rename from package/setserial/setserial-2.17-tiocghayesesp-build-fix.patch
rename to package/setserial/setserial-0002-tiocghayesesp-build-fix.patch
-- 
1.7.1

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 2/2] setserial: Disable manpages
  2014-09-04 11:18 [Buildroot] [PATCH 1/2] setserial: Rename patches to add sequence numbers Vicente Olivert Riera
@ 2014-09-04 11:18 ` Vicente Olivert Riera
  2014-09-04 15:21   ` Peter Korsgaard
  2014-09-04 15:21 ` [Buildroot] [PATCH 1/2] setserial: Rename patches to add sequence numbers Peter Korsgaard
  1 sibling, 1 reply; 6+ messages in thread
From: Vicente Olivert Riera @ 2014-09-04 11:18 UTC (permalink / raw)
  To: buildroot

There is no configure option to disable the manpages, so we use this
patch to disable them. Otherwise this package would fail to build on
systems without the groff package installed because the build system
calls 'nroff' in the Makefile.

Fixes:
  http://autobuild.buildroot.net/results/c73/c736933d4110865008f2d1e8b531b6e392c68285/

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Reviewed-by: Markos Chandras <Markos.Chandras@imgtec.com>
---
 .../setserial-0003-disable-manpages.patch          |   61 ++++++++++++++++++++
 1 files changed, 61 insertions(+), 0 deletions(-)
 create mode 100644 package/setserial/setserial-0003-disable-manpages.patch

diff --git a/package/setserial/setserial-0003-disable-manpages.patch b/package/setserial/setserial-0003-disable-manpages.patch
new file mode 100644
index 0000000..ebd3cb2
--- /dev/null
+++ b/package/setserial/setserial-0003-disable-manpages.patch
@@ -0,0 +1,61 @@
+setserial: Disable manpages
+
+There is no configure option to disable the manpages, so we use this 
+patch to disable them. Otherwise this package would fail to build on 
+systems without the groff package installed because the build system 
+calls 'nroff' in the Makefile.
+
+Fixes:
+  http://autobuild.buildroot.net/results/c73/c736933d4110865008f2d1e8b531b6e392c68285/
+
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+--- setserial-2.17/Makefile.in.orig	2014-09-04 11:58:05.685475241 +0100
++++ setserial-2.17/Makefile.in	2014-09-04 11:59:14.508641155 +0100
+@@ -17,26 +17,20 @@ DEFS = @DEFS@
+ INCS = -I.
+ TAR = tar
+ 
+-all: setserial setserial.cat
++all: setserial
+ 
+ setserial: setserial.c
+ 	$(CC) $(CFLAGS) $(DEFS) $(INCS) setserial.c -o setserial
+ 
+-setserial.cat: setserial.8
+-	nroff -man setserial.8 > setserial.cat
+-
+-install: setserial setserial.8
++install: setserial
+ 	mkdir -p $(DESTDIR)/usr/bin
+ 	$(INSTALL_PROGRAM) setserial $(DESTDIR)/usr/bin
+-	mkdir -p $(DESTDIR)/usr/share/man/man8
+-	$(INSTALL_DATA) setserial.8 $(DESTDIR)/usr/share/man/man8
+ 
+ clean:
+-	$(RM) setserial setserial.o setserial.cat *~
++	$(RM) setserial setserial.o *~
+ 
+ distclean: clean
+-	$(RM) config.status config.log config.cache MCONFIG Makefile \
+-		setserial.8
++	$(RM) config.status config.log config.cache MCONFIG Makefile
+ 
+ realclean: distclean
+ 	$(RM) configure
+@@ -57,7 +51,6 @@ $(srcdir)/.exclude-file:
+ 	echo "$(SRCROOT)/config.cache" >> $(srcdir)/.exclude-file
+ 	echo "$(SRCROOT)/config.status" >> $(srcdir)/.exclude-file
+ 	echo "$(SRCROOT)/setserial" >> $(srcdir)/.exclude-file
+-	echo "$(SRCROOT)/setserial.cat" >> $(srcdir)/.exclude-file
+ 	echo "$(SRCROOT)/setserial.o" >> $(srcdir)/.exclude-file
+ 	echo "$(SRCROOT)/.exclude-file" >> $(srcdir)/.exclude-file
+ 	echo $(SRCROOT)/e2fsprogs-$(VERSION).tar.gz \
+@@ -76,8 +69,5 @@ ${srcdir}/configure: configure.in # aclo
+ Makefile: Makefile.in config.status
+ 	CONFIG_FILES=Makefile ./config.status
+ 
+-setserial.8: setserial.8.in config.status
+-	CONFIG_FILES=setserial.8 ./config.status
+-     
+ config.status: configure
+ 	./config.status --recheck
-- 
1.7.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 2/2] setserial: Disable manpages
  2014-09-04 11:18 ` [Buildroot] [PATCH 2/2] setserial: Disable manpages Vicente Olivert Riera
@ 2014-09-04 15:21   ` Peter Korsgaard
  2014-09-04 15:24     ` Vicente Olivert Riera
  0 siblings, 1 reply; 6+ messages in thread
From: Peter Korsgaard @ 2014-09-04 15:21 UTC (permalink / raw)
  To: buildroot

>>>>> "Vicente" == Vicente Olivert Riera <Vincent.Riera@imgtec.com> writes:

 > There is no configure option to disable the manpages, so we use this
 > patch to disable them. Otherwise this package would fail to build on
 > systems without the groff package installed because the build system
 > calls 'nroff' in the Makefile.

 > Fixes:
 >   http://autobuild.buildroot.net/results/c73/c736933d4110865008f2d1e8b531b6e392c68285/

 > Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
 > Reviewed-by: Markos Chandras <Markos.Chandras@imgtec.com>
 > ---
 >  .../setserial-0003-disable-manpages.patch          |   61 ++++++++++++++++++++
 >  1 files changed, 61 insertions(+), 0 deletions(-)
 >  create mode 100644 package/setserial/setserial-0003-disable-manpages.patch

 > diff --git a/package/setserial/setserial-0003-disable-manpages.patch b/package/setserial/setserial-0003-disable-manpages.patch
 > new file mode 100644
 > index 0000000..ebd3cb2
 > --- /dev/null
 > +++ b/package/setserial/setserial-0003-disable-manpages.patch
 > @@ -0,0 +1,61 @@
 > +setserial: Disable manpages
 > +
 > +There is no configure option to disable the manpages, so we use this 
 > +patch to disable them. Otherwise this package would fail to build on 
 > +systems without the groff package installed because the build system 
 > +calls 'nroff' in the Makefile.

Nit: All these lines have a trailing space.

 > +
 > +Fixes:
 > +  http://autobuild.buildroot.net/results/c73/c736933d4110865008f2d1e8b531b6e392c68285/
 > +
 > +Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
 > +--- setserial-2.17/Makefile.in.orig	2014-09-04 11:58:05.685475241 +0100
 > ++++ setserial-2.17/Makefile.in	2014-09-04 11:59:14.508641155 +0100
 > +@@ -17,26 +17,20 @@ DEFS = @DEFS@
 > + INCS = -I.
 > + TAR = tar
 > + 
 > +-all: setserial setserial.cat
 > ++all: setserial

As far as I can see, nroff is only used for setserial.cat, and
setserial.cat is not installed / used anywhere, so just patching this
line is enough and the rest of the patch can get dropped.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 1/2] setserial: Rename patches to add sequence numbers
  2014-09-04 11:18 [Buildroot] [PATCH 1/2] setserial: Rename patches to add sequence numbers Vicente Olivert Riera
  2014-09-04 11:18 ` [Buildroot] [PATCH 2/2] setserial: Disable manpages Vicente Olivert Riera
@ 2014-09-04 15:21 ` Peter Korsgaard
  1 sibling, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2014-09-04 15:21 UTC (permalink / raw)
  To: buildroot

>>>>> "Vicente" == Vicente Olivert Riera <Vincent.Riera@imgtec.com> writes:

 > Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
 > Reviewed-by: Markos Chandras <Markos.Chandras@imgtec.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 2/2] setserial: Disable manpages
  2014-09-04 15:21   ` Peter Korsgaard
@ 2014-09-04 15:24     ` Vicente Olivert Riera
  2014-09-04 20:39       ` Peter Korsgaard
  0 siblings, 1 reply; 6+ messages in thread
From: Vicente Olivert Riera @ 2014-09-04 15:24 UTC (permalink / raw)
  To: buildroot

On 09/04/2014 04:21 PM, Peter Korsgaard wrote:
>>>>>> "Vicente" == Vicente Olivert Riera <Vincent.Riera@imgtec.com> writes:
>
>   > There is no configure option to disable the manpages, so we use this
>   > patch to disable them. Otherwise this package would fail to build on
>   > systems without the groff package installed because the build system
>   > calls 'nroff' in the Makefile.
>
>   > Fixes:
>   >   http://autobuild.buildroot.net/results/c73/c736933d4110865008f2d1e8b531b6e392c68285/
>
>   > Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
>   > Reviewed-by: Markos Chandras <Markos.Chandras@imgtec.com>
>   > ---
>   >  .../setserial-0003-disable-manpages.patch          |   61 ++++++++++++++++++++
>   >  1 files changed, 61 insertions(+), 0 deletions(-)
>   >  create mode 100644 package/setserial/setserial-0003-disable-manpages.patch
>
>   > diff --git a/package/setserial/setserial-0003-disable-manpages.patch b/package/setserial/setserial-0003-disable-manpages.patch
>   > new file mode 100644
>   > index 0000000..ebd3cb2
>   > --- /dev/null
>   > +++ b/package/setserial/setserial-0003-disable-manpages.patch
>   > @@ -0,0 +1,61 @@
>   > +setserial: Disable manpages
>   > +
>   > +There is no configure option to disable the manpages, so we use this
>   > +patch to disable them. Otherwise this package would fail to build on
>   > +systems without the groff package installed because the build system
>   > +calls 'nroff' in the Makefile.
>
> Nit: All these lines have a trailing space.
>
>   > +
>   > +Fixes:
>   > +  http://autobuild.buildroot.net/results/c73/c736933d4110865008f2d1e8b531b6e392c68285/
>   > +
>   > +Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
>   > +--- setserial-2.17/Makefile.in.orig	2014-09-04 11:58:05.685475241 +0100
>   > ++++ setserial-2.17/Makefile.in	2014-09-04 11:59:14.508641155 +0100
>   > +@@ -17,26 +17,20 @@ DEFS = @DEFS@
>   > + INCS = -I.
>   > + TAR = tar
>   > +
>   > +-all: setserial setserial.cat
>   > ++all: setserial
>
> As far as I can see, nroff is only used for setserial.cat, and
> setserial.cat is not installed / used anywhere, so just patching this
> line is enough and the rest of the patch can get dropped.

Don't you prefer to completely get rid of the manual pages?


-- 
Vincent

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 2/2] setserial: Disable manpages
  2014-09-04 15:24     ` Vicente Olivert Riera
@ 2014-09-04 20:39       ` Peter Korsgaard
  0 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2014-09-04 20:39 UTC (permalink / raw)
  To: buildroot

>>>>> "Vicente" == Vicente Olivert Riera <Vincent.Riera@imgtec.com> writes:

Hi,

 >> > +-all: setserial setserial.cat
 >> > ++all: setserial
 >> 
 >> As far as I can see, nroff is only used for setserial.cat, and
 >> setserial.cat is not installed / used anywhere, so just patching this
 >> line is enough and the rest of the patch can get dropped.

 > Don't you prefer to completely get rid of the manual pages?

Well, yes - But we already do that globally in target-finalize, so we
don't need to do it explicitly here.

I've committed an even simpler fix - Simply use 'make setserial' instead
of 'make all' so setserial.cat doesn't get built.

Thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2014-09-04 20:39 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-04 11:18 [Buildroot] [PATCH 1/2] setserial: Rename patches to add sequence numbers Vicente Olivert Riera
2014-09-04 11:18 ` [Buildroot] [PATCH 2/2] setserial: Disable manpages Vicente Olivert Riera
2014-09-04 15:21   ` Peter Korsgaard
2014-09-04 15:24     ` Vicente Olivert Riera
2014-09-04 20:39       ` Peter Korsgaard
2014-09-04 15:21 ` [Buildroot] [PATCH 1/2] setserial: Rename patches to add sequence numbers Peter Korsgaard

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox