linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Documentation: fix DOCBOOKS=... building
@ 2012-06-13  8:43 Johannes Berg
  2012-07-27 22:29 ` Randy Dunlap
  0 siblings, 1 reply; 8+ messages in thread
From: Johannes Berg @ 2012-06-13  8:43 UTC (permalink / raw)
  To: Randy Dunlap; +Cc: LKML, Mauro Carvalho Chehab

From: Johannes Berg <johannes.berg@intel.com>

Prior to 
commit 4266129964b8238526936d723de65b419d8069c6
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date:   Tue May 31 16:27:44 2011 -0300

    [media] DocBook: Move all media docbook stuff into its own directory

it was possible to build only a single (or more)
book(s) by calling, for example
	make htmldocs DOCBOOKS=80211.xml

This now fails:
cp: target `.../Documentation/DocBook//media_api' is not a directory

Ignore errors from that copy to make this possible again.

Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
I complained about this a long time ago, but now it finally bothered me
enough to fix it ... :-)

 Documentation/DocBook/media/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/Documentation/DocBook/media/Makefile	2012-06-13 10:39:58.000000000 +0200
+++ b/Documentation/DocBook/media/Makefile	2012-06-13 10:40:05.000000000 +0200
@@ -195,7 +195,7 @@ DVB_DOCUMENTED = \
 #
 
 install_media_images = \
-	$(Q)cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api
+	$(Q)-cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api
 
 $(MEDIA_OBJ_DIR)/%: $(MEDIA_SRC_DIR)/%.b64
 	$(Q)base64 -d $< >$@



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

* Re: [PATCH] Documentation: fix DOCBOOKS=... building
  2012-06-13  8:43 [PATCH] Documentation: fix DOCBOOKS=... building Johannes Berg
@ 2012-07-27 22:29 ` Randy Dunlap
  2012-07-28 11:26   ` Johannes Berg
  0 siblings, 1 reply; 8+ messages in thread
From: Randy Dunlap @ 2012-07-27 22:29 UTC (permalink / raw)
  To: Johannes Berg; +Cc: LKML, Mauro Carvalho Chehab

On 06/13/2012 01:43 AM, Johannes Berg wrote:

> From: Johannes Berg <johannes.berg@intel.com>
> 
> Prior to 
> commit 4266129964b8238526936d723de65b419d8069c6
> Author: Mauro Carvalho Chehab <mchehab@redhat.com>
> Date:   Tue May 31 16:27:44 2011 -0300
> 
>     [media] DocBook: Move all media docbook stuff into its own directory
> 
> it was possible to build only a single (or more)
> book(s) by calling, for example
> 	make htmldocs DOCBOOKS=80211.xml
> 
> This now fails:
> cp: target `.../Documentation/DocBook//media_api' is not a directory
> 
> Ignore errors from that copy to make this possible again.
> 
> Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> ---
> I complained about this a long time ago, but now it finally bothered me
> enough to fix it ... :-)


Thanks.

Acked-by: Randy Dunlap <rdunlap@xenotime.net>

Mauro??


> 
>  Documentation/DocBook/media/Makefile |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> --- a/Documentation/DocBook/media/Makefile	2012-06-13 10:39:58.000000000 +0200
> +++ b/Documentation/DocBook/media/Makefile	2012-06-13 10:40:05.000000000 +0200
> @@ -195,7 +195,7 @@ DVB_DOCUMENTED = \
>  #
>  
>  install_media_images = \
> -	$(Q)cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api
> +	$(Q)-cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api
>  
>  $(MEDIA_OBJ_DIR)/%: $(MEDIA_SRC_DIR)/%.b64
>  	$(Q)base64 -d $< >$@
> 
> 



-- 
~Randy

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

* Re: [PATCH] Documentation: fix DOCBOOKS=... building
  2012-07-27 22:29 ` Randy Dunlap
@ 2012-07-28 11:26   ` Johannes Berg
  2012-07-28 15:05     ` Randy Dunlap
  0 siblings, 1 reply; 8+ messages in thread
From: Johannes Berg @ 2012-07-28 11:26 UTC (permalink / raw)
  To: Randy Dunlap; +Cc: LKML, Mauro Carvalho Chehab

On Fri, 2012-07-27 at 15:29 -0700, Randy Dunlap wrote:
> On 06/13/2012 01:43 AM, Johannes Berg wrote:
> 
> > From: Johannes Berg <johannes.berg@intel.com>
> > 
> > Prior to 
> > commit 4266129964b8238526936d723de65b419d8069c6
> > Author: Mauro Carvalho Chehab <mchehab@redhat.com>
> > Date:   Tue May 31 16:27:44 2011 -0300
> > 
> >     [media] DocBook: Move all media docbook stuff into its own directory
> > 
> > it was possible to build only a single (or more)
> > book(s) by calling, for example
> > 	make htmldocs DOCBOOKS=80211.xml
> > 
> > This now fails:
> > cp: target `.../Documentation/DocBook//media_api' is not a directory
> > 
> > Ignore errors from that copy to make this possible again.
> > 
> > Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
> > Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> > ---
> > I complained about this a long time ago, but now it finally bothered me
> > enough to fix it ... :-)
> 
> 
> Thanks.
> 
> Acked-by: Randy Dunlap <rdunlap@xenotime.net>

Can you apply it somewhere, or should I send it to Andrew, or do you
have any other ideas?

johannes


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

* Re: [PATCH] Documentation: fix DOCBOOKS=... building
  2012-07-28 11:26   ` Johannes Berg
@ 2012-07-28 15:05     ` Randy Dunlap
  2012-07-28 16:48       ` Johannes Berg
  2012-07-29  0:33       ` Rob Landley
  0 siblings, 2 replies; 8+ messages in thread
From: Randy Dunlap @ 2012-07-28 15:05 UTC (permalink / raw)
  To: Johannes Berg; +Cc: LKML, Mauro Carvalho Chehab, Rob Landley

On 07/28/2012 04:26 AM, Johannes Berg wrote:

> On Fri, 2012-07-27 at 15:29 -0700, Randy Dunlap wrote:
>> On 06/13/2012 01:43 AM, Johannes Berg wrote:
>>
>>> From: Johannes Berg <johannes.berg@intel.com>
>>>
>>> Prior to 
>>> commit 4266129964b8238526936d723de65b419d8069c6
>>> Author: Mauro Carvalho Chehab <mchehab@redhat.com>
>>> Date:   Tue May 31 16:27:44 2011 -0300
>>>
>>>     [media] DocBook: Move all media docbook stuff into its own directory
>>>
>>> it was possible to build only a single (or more)
>>> book(s) by calling, for example
>>> 	make htmldocs DOCBOOKS=80211.xml
>>>
>>> This now fails:
>>> cp: target `.../Documentation/DocBook//media_api' is not a directory
>>>
>>> Ignore errors from that copy to make this possible again.
>>>
>>> Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
>>> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
>>> ---
>>> I complained about this a long time ago, but now it finally bothered me
>>> enough to fix it ... :-)
>>
>>
>> Thanks.
>>
>> Acked-by: Randy Dunlap <rdunlap@xenotime.net>
> 
> Can you apply it somewhere, or should I send it to Andrew, or do you
> have any other ideas?


I'm no longer the Documentation maintainer, but Rob Landley
could merge it.  You probably will need to resend it to him.

-- 
~Randy

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

* [PATCH] Documentation: fix DOCBOOKS=... building
  2012-07-28 15:05     ` Randy Dunlap
@ 2012-07-28 16:48       ` Johannes Berg
  2012-07-29  0:33       ` Rob Landley
  1 sibling, 0 replies; 8+ messages in thread
From: Johannes Berg @ 2012-07-28 16:48 UTC (permalink / raw)
  To: Randy Dunlap; +Cc: LKML, Mauro Carvalho Chehab, Rob Landley

From: Johannes Berg <johannes.berg@intel.com>

Prior to 
commit 4266129964b8238526936d723de65b419d8069c6
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date:   Tue May 31 16:27:44 2011 -0300

    [media] DocBook: Move all media docbook stuff into its own directory

it was possible to build only a single (or more)
book(s) by calling, for example
	make htmldocs DOCBOOKS=80211.xml

This now fails:
cp: target `.../Documentation/DocBook//media_api' is not a directory

Ignore errors from that copy to make this possible again.

Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
> I'm no longer the Documentation maintainer, but Rob Landley
> could merge it.  You probably will need to resend it to him.
 

 Documentation/DocBook/media/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/Documentation/DocBook/media/Makefile	2012-06-13 10:39:58.000000000 +0200
+++ b/Documentation/DocBook/media/Makefile	2012-06-13 10:40:05.000000000 +0200
@@ -195,7 +195,7 @@ DVB_DOCUMENTED = \
 #
 
 install_media_images = \
-	$(Q)cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api
+	$(Q)-cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api
 
 $(MEDIA_OBJ_DIR)/%: $(MEDIA_SRC_DIR)/%.b64
 	$(Q)base64 -d $< >$@



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

* Re: [PATCH] Documentation: fix DOCBOOKS=... building
  2012-07-28 15:05     ` Randy Dunlap
  2012-07-28 16:48       ` Johannes Berg
@ 2012-07-29  0:33       ` Rob Landley
  2012-07-30  0:16         ` Mauro Carvalho Chehab
  1 sibling, 1 reply; 8+ messages in thread
From: Rob Landley @ 2012-07-29  0:33 UTC (permalink / raw)
  To: Randy Dunlap; +Cc: Johannes Berg, LKML, Mauro Carvalho Chehab

On 07/28/2012 10:05 AM, Randy Dunlap wrote:
> On 07/28/2012 04:26 AM, Johannes Berg wrote:
> 
>> On Fri, 2012-07-27 at 15:29 -0700, Randy Dunlap wrote:
>>> On 06/13/2012 01:43 AM, Johannes Berg wrote:
>>>
>>>> From: Johannes Berg <johannes.berg@intel.com>
>>>>
>>>> Prior to 
>>>> commit 4266129964b8238526936d723de65b419d8069c6
>>>> Author: Mauro Carvalho Chehab <mchehab@redhat.com>
>>>> Date:   Tue May 31 16:27:44 2011 -0300
>>>>
>>>>     [media] DocBook: Move all media docbook stuff into its own directory
>>>>
>>>> it was possible to build only a single (or more)
>>>> book(s) by calling, for example
>>>> 	make htmldocs DOCBOOKS=80211.xml
>>>>
>>>> This now fails:
>>>> cp: target `.../Documentation/DocBook//media_api' is not a directory
>>>>
>>>> Ignore errors from that copy to make this possible again.
>>>>
>>>> Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
>>>> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
>>>> ---
>>>> I complained about this a long time ago, but now it finally bothered me
>>>> enough to fix it ... :-)
>>>
>>>
>>> Thanks.
>>>
>>> Acked-by: Randy Dunlap <rdunlap@xenotime.net>
>>
>> Can you apply it somewhere, or should I send it to Andrew, or do you
>> have any other ideas?
> 
> 
> I'm no longer the Documentation maintainer, but Rob Landley
> could merge it.  You probably will need to resend it to him.

Acked-by: Rob landley <rob@landley.net>

I'll forward it. Thanks,

Rob
-- 
GNU/Linux isn't: Linux=GPLv2, GNU=GPLv3+, they can't share code.
Either it's "mere aggregation", or a license violation.  Pick one.

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

* Re: [PATCH] Documentation: fix DOCBOOKS=... building
  2012-07-29  0:33       ` Rob Landley
@ 2012-07-30  0:16         ` Mauro Carvalho Chehab
  0 siblings, 0 replies; 8+ messages in thread
From: Mauro Carvalho Chehab @ 2012-07-30  0:16 UTC (permalink / raw)
  To: Rob Landley; +Cc: Randy Dunlap, Johannes Berg, LKML

Em 28-07-2012 21:33, Rob Landley escreveu:
> On 07/28/2012 10:05 AM, Randy Dunlap wrote:
>> On 07/28/2012 04:26 AM, Johannes Berg wrote:
>>
>>> On Fri, 2012-07-27 at 15:29 -0700, Randy Dunlap wrote:
>>>> On 06/13/2012 01:43 AM, Johannes Berg wrote:
>>>>
>>>>> From: Johannes Berg <johannes.berg@intel.com>
>>>>>
>>>>> Prior to
>>>>> commit 4266129964b8238526936d723de65b419d8069c6
>>>>> Author: Mauro Carvalho Chehab <mchehab@redhat.com>
>>>>> Date:   Tue May 31 16:27:44 2011 -0300
>>>>>
>>>>>      [media] DocBook: Move all media docbook stuff into its own directory
>>>>>
>>>>> it was possible to build only a single (or more)
>>>>> book(s) by calling, for example
>>>>> 	make htmldocs DOCBOOKS=80211.xml
>>>>>
>>>>> This now fails:
>>>>> cp: target `.../Documentation/DocBook//media_api' is not a directory
>>>>>
>>>>> Ignore errors from that copy to make this possible again.
>>>>>
>>>>> Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
>>>>> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
>>>>> ---
>>>>> I complained about this a long time ago, but now it finally bothered me
>>>>> enough to fix it ... :-)
>>>>
>>>>
>>>> Thanks.
>>>>
>>>> Acked-by: Randy Dunlap <rdunlap@xenotime.net>
>>>
>>> Can you apply it somewhere, or should I send it to Andrew, or do you
>>> have any other ideas?
>>
>>
>> I'm no longer the Documentation maintainer, but Rob Landley
>> could merge it.  You probably will need to resend it to him.

Sorry for not answering earlier. I was on vacations ;)

> 
> Acked-by: Rob landley <rob@landley.net>

Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>

> 
> I'll forward it. Thanks,
> 
> Rob
> 

Regards,
Mauro


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

* [PATCH] Documentation: fix DOCBOOKS=... building
@ 2014-05-20 13:12 Johannes Berg
  0 siblings, 0 replies; 8+ messages in thread
From: Johannes Berg @ 2014-05-20 13:12 UTC (permalink / raw)
  To: Andrew Morton
  Cc: linux-kernel, Mauro Carvalho Chehab, Randy Dunlap, Johannes Berg

From: Johannes Berg <johannes.berg@intel.com>

Prior to
commit 4266129964b8238526936d723de65b419d8069c6
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date:   Tue May 31 16:27:44 2011 -0300

    [media] DocBook: Move all media docbook stuff into its own directory

it was possible to build only a single (or more)
book(s) by calling, for example
	make htmldocs DOCBOOKS=80211.xml

This now fails:
cp: target `.../Documentation/DocBook//media_api' is not a directory

Ignore errors from that copy to make this possible again.

Fixes: 4266129964b8 ("[media] DocBook: Move all media docbook stuff into its own directory")
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
Both Rand and I sent this patch almost a year ago, but it didn't stick.
Can somebody please take it? :-)

Thanks,
johannes
---
 Documentation/DocBook/media/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/DocBook/media/Makefile b/Documentation/DocBook/media/Makefile
index f9fd615427fb..1d27f0a1abd1 100644
--- a/Documentation/DocBook/media/Makefile
+++ b/Documentation/DocBook/media/Makefile
@@ -195,7 +195,7 @@ DVB_DOCUMENTED = \
 #
 
 install_media_images = \
-	$(Q)cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api
+	$(Q)-cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api
 
 $(MEDIA_OBJ_DIR)/%: $(MEDIA_SRC_DIR)/%.b64
 	$(Q)base64 -d $< >$@
-- 
2.0.0.rc0


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

end of thread, other threads:[~2014-05-20 13:12 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-06-13  8:43 [PATCH] Documentation: fix DOCBOOKS=... building Johannes Berg
2012-07-27 22:29 ` Randy Dunlap
2012-07-28 11:26   ` Johannes Berg
2012-07-28 15:05     ` Randy Dunlap
2012-07-28 16:48       ` Johannes Berg
2012-07-29  0:33       ` Rob Landley
2012-07-30  0:16         ` Mauro Carvalho Chehab
2014-05-20 13:12 Johannes Berg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).