[PATCH] ioemu: build fixes for netbsd packaging

[PATCH] ioemu: build fixes for netbsd packaging

[Christoph Egger]

[-- Attachment #1: Type: text/plain, Size: 914 bytes --]


Hi,

While I was about to package Xen 4.1.0 for NetBSD, I run over some build 
issues which the attached patch fixes.

NetBSD's pkgsrc installs the packages to /usr/pkg by default.
So the patch fixes:
- Installation of qemu-dm into non-default directory
- Run perl scripts where perl binary is not under /usr/bin/
- Fix compatibility with texi2html-5.0 [1]

Please apply this also to Xen-4.1-testing.

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>


[1] The error message is this:
   Option number is ambiguous (number-footnotes, number-sections)
   Try `texi2html --help' for more information.
   gmake[2]: *** [qemu-tech.html] Error 2


-- 
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85689 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632

[-- Attachment #2: xen_ioemu_netbsd.diff --]
[-- Type: text/plain, Size: 3315 bytes --]

diff --git a/Makefile b/Makefile
index 37c7066..3de5022 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Makefile for QEMU.
 
-include config-host.mak
-include $(SRC_PATH)/rules.mak
+-include config-host.mak
+-include $(SRC_PATH)/rules.mak
 
 .PHONY: all clean cscope distclean dvi html info install install-doc \
 	recurse-all speed tar tarbin test
@@ -231,30 +231,30 @@ BLOBS=
 endif
 
 install-doc: $(DOCS)
-	mkdir -p "$(DESTDIR)$(docdir)"
-	$(INSTALL) -m 644 qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
+	$(INSTALL_DIR) "$(DESTDIR)$(docdir)"
+	$(INSTALL_DATA) qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
 ifndef CONFIG_WIN32
-	mkdir -p "$(DESTDIR)$(mandir)/man1"
-	$(INSTALL) -m 644 qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
-	mkdir -p "$(DESTDIR)$(mandir)/man8"
-	$(INSTALL) -m 644 qemu-nbd.8 "$(DESTDIR)$(mandir)/man8"
+	$(INSTALL_DIR) "$(DESTDIR)$(MAN1DIR)"
+	$(INSTALL_DATA) qemu.1 qemu-img.1 "$(DESTDIR)$(MAN1DIR)"
+	$(INSTALL_DIR) "$(DESTDIR)$(MAN8DIR)"
+	$(INSTALL_DATA) qemu-nbd.8 "$(DESTDIR)$(MAN8DIR)"
 endif
 
 install: all $(if $(BUILD_DOCS),install-doc)
-	mkdir -p "$(DESTDIR)$(bindir)"
+	$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
 ifneq ($(TOOLS),)
-	$(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
+	$(INSTALL_PROG) -s $(TOOLS) "$(DESTDIR)$(bindir)"
 endif
 ifneq ($(BLOBS),)
-	mkdir -p "$(DESTDIR)$(datadir)"
+	$(INSTALL_DIR) "$(DESTDIR)$(datadir)"
 	set -e; for x in $(BLOBS); do \
-		$(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
+		$(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
 	done
 endif
 ifndef CONFIG_WIN32
-	mkdir -p "$(DESTDIR)$(datadir)/keymaps"
+	$(INSTALL_DIR) "$(DESTDIR)$(datadir)/keymaps"
 	set -e; for x in $(KEYMAPS); do \
-		$(INSTALL) -m 644 $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \
+		$(INSTALL_DATA) $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \
 	done
 endif
 	for d in $(TARGET_DIRS); do \
@@ -275,7 +275,7 @@ cscope:
 
 # documentation
 %.html: %.texi
-	texi2html -monolithic -number $<
+	texi2html -monolithic -number-sections $<
 
 %.info: %.texi
 	makeinfo $< -o $@
@@ -284,15 +284,15 @@ cscope:
 	texi2dvi $<
 
 qemu.1: qemu-doc.texi
-	$(SRC_PATH)/texi2pod.pl $< qemu.pod
+	perl $(SRC_PATH)/texi2pod.pl $< qemu.pod
 	pod2man --section=1 --center=" " --release=" " qemu.pod > $@
 
 qemu-img.1: qemu-img.texi
-	$(SRC_PATH)/texi2pod.pl $< qemu-img.pod
+	perl $(SRC_PATH)/texi2pod.pl $< qemu-img.pod
 	pod2man --section=1 --center=" " --release=" " qemu-img.pod > $@
 
 qemu-nbd.8: qemu-nbd.texi
-	$(SRC_PATH)/texi2pod.pl $< qemu-nbd.pod
+	perl $(SRC_PATH)/texi2pod.pl $< qemu-nbd.pod
 	pod2man --section=8 --center=" " --release=" " qemu-nbd.pod > $@
 
 info: qemu-doc.info qemu-tech.info
diff --git a/configure b/configure
index 904e019..689298d 100755
--- a/configure
+++ b/configure
@@ -1215,6 +1215,9 @@ echo "docdir=\${prefix}$docsuffix" >> $config_mak
 echo "#define CONFIG_QEMU_SHAREDIR \"$prefix$datasuffix\"" >> $config_h
 echo "MAKE=$make" >> $config_mak
 echo "INSTALL=$install" >> $config_mak
+echo "INSTALL_DIR=$install -d -m0755 -p" >> $config_mak
+echo "INSTALL_DATA=$install -m0644 -p" >> $config_mak
+echo "INSTALL_PROG=$install -m0755 -p" >> $config_mak
 echo "CC=$cc" >> $config_mak
 echo "HOST_CC=$host_cc" >> $config_mak
 echo "AR=$ar" >> $config_mak

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Re: [PATCH] ioemu: build fixes for netbsd packaging

[Christoph Egger]

ping...

On 04/15/11 14:00, Christoph Egger wrote:
>
> Hi,
>
> While I was about to package Xen 4.1.0 for NetBSD, I run over some build
> issues which the attached patch fixes.
>
> NetBSD's pkgsrc installs the packages to /usr/pkg by default.
> So the patch fixes:
> - Installation of qemu-dm into non-default directory
> - Run perl scripts where perl binary is not under /usr/bin/
> - Fix compatibility with texi2html-5.0 [1]
>
> Please apply this also to Xen-4.1-testing.
>
> Signed-off-by: Christoph Egger<Christoph.Egger@amd.com>
>
>
> [1] The error message is this:
>     Option number is ambiguous (number-footnotes, number-sections)
>     Try `texi2html --help' for more information.
>     gmake[2]: *** [qemu-tech.html] Error 2
>
>


-- 
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85689 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632

Re: [PATCH] ioemu: build fixes for netbsd packaging

[Christoph Egger]

Is there a problem with committing this patch?

Christoph


On 04/15/11 14:00, Christoph Egger wrote:
>
> Hi,
>
> While I was about to package Xen 4.1.0 for NetBSD, I run over some build
> issues which the attached patch fixes.
>
> NetBSD's pkgsrc installs the packages to /usr/pkg by default.
> So the patch fixes:
> - Installation of qemu-dm into non-default directory
> - Run perl scripts where perl binary is not under /usr/bin/
> - Fix compatibility with texi2html-5.0 [1]
>
> Please apply this also to Xen-4.1-testing.
>
> Signed-off-by: Christoph Egger<Christoph.Egger@amd.com>
>
>
> [1] The error message is this:
>     Option number is ambiguous (number-footnotes, number-sections)
>     Try `texi2html --help' for more information.
>     gmake[2]: *** [qemu-tech.html] Error 2
>
>


-- 
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85689 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632

Re: [PATCH] ioemu: build fixes for netbsd packaging

[Christoph Egger]

[-- Attachment #1: Type: text/plain, Size: 1130 bytes --]


Ian Campbell: There is no response from Ian Jackson at all.
Can you commit it before Xen 4.1.1 release, please? Thanks.

Christoph


On 04/15/11 14:00, Christoph Egger wrote:
>
> Hi,
>
> While I was about to package Xen 4.1.0 for NetBSD, I run over some build
> issues which the attached patch fixes.
>
> NetBSD's pkgsrc installs the packages to /usr/pkg by default.
> So the patch fixes:
> - Installation of qemu-dm into non-default directory
> - Run perl scripts where perl binary is not under /usr/bin/
> - Fix compatibility with texi2html-5.0 [1]
>
> Please apply this also to Xen-4.1-testing.
>
> Signed-off-by: Christoph Egger<Christoph.Egger@amd.com>
>
>
> [1] The error message is this:
>     Option number is ambiguous (number-footnotes, number-sections)
>     Try `texi2html --help' for more information.
>     gmake[2]: *** [qemu-tech.html] Error 2
>
>


-- 
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85689 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632

[-- Attachment #2: xen_ioemu_netbsd.diff --]
[-- Type: text/plain, Size: 3315 bytes --]

diff --git a/Makefile b/Makefile
index 37c7066..3de5022 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Makefile for QEMU.
 
-include config-host.mak
-include $(SRC_PATH)/rules.mak
+-include config-host.mak
+-include $(SRC_PATH)/rules.mak
 
 .PHONY: all clean cscope distclean dvi html info install install-doc \
 	recurse-all speed tar tarbin test
@@ -231,30 +231,30 @@ BLOBS=
 endif
 
 install-doc: $(DOCS)
-	mkdir -p "$(DESTDIR)$(docdir)"
-	$(INSTALL) -m 644 qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
+	$(INSTALL_DIR) "$(DESTDIR)$(docdir)"
+	$(INSTALL_DATA) qemu-doc.html  qemu-tech.html "$(DESTDIR)$(docdir)"
 ifndef CONFIG_WIN32
-	mkdir -p "$(DESTDIR)$(mandir)/man1"
-	$(INSTALL) -m 644 qemu.1 qemu-img.1 "$(DESTDIR)$(mandir)/man1"
-	mkdir -p "$(DESTDIR)$(mandir)/man8"
-	$(INSTALL) -m 644 qemu-nbd.8 "$(DESTDIR)$(mandir)/man8"
+	$(INSTALL_DIR) "$(DESTDIR)$(MAN1DIR)"
+	$(INSTALL_DATA) qemu.1 qemu-img.1 "$(DESTDIR)$(MAN1DIR)"
+	$(INSTALL_DIR) "$(DESTDIR)$(MAN8DIR)"
+	$(INSTALL_DATA) qemu-nbd.8 "$(DESTDIR)$(MAN8DIR)"
 endif
 
 install: all $(if $(BUILD_DOCS),install-doc)
-	mkdir -p "$(DESTDIR)$(bindir)"
+	$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
 ifneq ($(TOOLS),)
-	$(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
+	$(INSTALL_PROG) -s $(TOOLS) "$(DESTDIR)$(bindir)"
 endif
 ifneq ($(BLOBS),)
-	mkdir -p "$(DESTDIR)$(datadir)"
+	$(INSTALL_DIR) "$(DESTDIR)$(datadir)"
 	set -e; for x in $(BLOBS); do \
-		$(INSTALL) -m 644 $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
+		$(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(datadir)"; \
 	done
 endif
 ifndef CONFIG_WIN32
-	mkdir -p "$(DESTDIR)$(datadir)/keymaps"
+	$(INSTALL_DIR) "$(DESTDIR)$(datadir)/keymaps"
 	set -e; for x in $(KEYMAPS); do \
-		$(INSTALL) -m 644 $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \
+		$(INSTALL_DATA) $(SRC_PATH)/keymaps/$$x "$(DESTDIR)$(datadir)/keymaps"; \
 	done
 endif
 	for d in $(TARGET_DIRS); do \
@@ -275,7 +275,7 @@ cscope:
 
 # documentation
 %.html: %.texi
-	texi2html -monolithic -number $<
+	texi2html -monolithic -number-sections $<
 
 %.info: %.texi
 	makeinfo $< -o $@
@@ -284,15 +284,15 @@ cscope:
 	texi2dvi $<
 
 qemu.1: qemu-doc.texi
-	$(SRC_PATH)/texi2pod.pl $< qemu.pod
+	perl $(SRC_PATH)/texi2pod.pl $< qemu.pod
 	pod2man --section=1 --center=" " --release=" " qemu.pod > $@
 
 qemu-img.1: qemu-img.texi
-	$(SRC_PATH)/texi2pod.pl $< qemu-img.pod
+	perl $(SRC_PATH)/texi2pod.pl $< qemu-img.pod
 	pod2man --section=1 --center=" " --release=" " qemu-img.pod > $@
 
 qemu-nbd.8: qemu-nbd.texi
-	$(SRC_PATH)/texi2pod.pl $< qemu-nbd.pod
+	perl $(SRC_PATH)/texi2pod.pl $< qemu-nbd.pod
 	pod2man --section=8 --center=" " --release=" " qemu-nbd.pod > $@
 
 info: qemu-doc.info qemu-tech.info
diff --git a/configure b/configure
index 904e019..689298d 100755
--- a/configure
+++ b/configure
@@ -1215,6 +1215,9 @@ echo "docdir=\${prefix}$docsuffix" >> $config_mak
 echo "#define CONFIG_QEMU_SHAREDIR \"$prefix$datasuffix\"" >> $config_h
 echo "MAKE=$make" >> $config_mak
 echo "INSTALL=$install" >> $config_mak
+echo "INSTALL_DIR=$install -d -m0755 -p" >> $config_mak
+echo "INSTALL_DATA=$install -m0644 -p" >> $config_mak
+echo "INSTALL_PROG=$install -m0755 -p" >> $config_mak
 echo "CC=$cc" >> $config_mak
 echo "HOST_CC=$host_cc" >> $config_mak
 echo "AR=$ar" >> $config_mak

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Re: [PATCH] ioemu: build fixes for netbsd packaging

[Tim Deegan]

At 11:13 +0100 on 24 May (1306235630), Christoph Egger wrote:
> 
> Ian Campbell: There is no response from Ian Jackson at all.
> Can you commit it before Xen 4.1.1 release, please? Thanks.

Ian Campbell is not the person to ask.  Stefano (cc'd) is the other
tools maintainer, and Keir is the committer of last resort.  

Cheers,

Tim.

-- 
Tim Deegan <Tim.Deegan@citrix.com>
Principal Software Engineer, Xen Platform Team
Citrix Systems UK Ltd.  (Company #02937203, SL9 0BG)

Re: [PATCH] ioemu: build fixes for netbsd packaging

[Keir Fraser]

On 24/05/2011 11:13, "Christoph Egger" <Christoph.Egger@amd.com> wrote:

> 
> Ian Campbell: There is no response from Ian Jackson at all.
> Can you commit it before Xen 4.1.1 release, please? Thanks.

Doesn't it belong in xen-unstable first?

 -- Keir

> Christoph
> 
> 
> On 04/15/11 14:00, Christoph Egger wrote:
>> 
>> Hi,
>> 
>> While I was about to package Xen 4.1.0 for NetBSD, I run over some build
>> issues which the attached patch fixes.
>> 
>> NetBSD's pkgsrc installs the packages to /usr/pkg by default.
>> So the patch fixes:
>> - Installation of qemu-dm into non-default directory
>> - Run perl scripts where perl binary is not under /usr/bin/
>> - Fix compatibility with texi2html-5.0 [1]
>> 
>> Please apply this also to Xen-4.1-testing.
>> 
>> Signed-off-by: Christoph Egger<Christoph.Egger@amd.com>
>> 
>> 
>> [1] The error message is this:
>>     Option number is ambiguous (number-footnotes, number-sections)
>>     Try `texi2html --help' for more information.
>>     gmake[2]: *** [qemu-tech.html] Error 2
>> 
>> 
> 

Re: [PATCH] ioemu: build fixes for netbsd packaging

[Keir Fraser]

On 24/05/2011 11:29, "Tim Deegan" <Tim.Deegan@citrix.com> wrote:

> At 11:13 +0100 on 24 May (1306235630), Christoph Egger wrote:
>> 
>> Ian Campbell: There is no response from Ian Jackson at all.
>> Can you commit it before Xen 4.1.1 release, please? Thanks.
> 
> Ian Campbell is not the person to ask.  Stefano (cc'd) is the other
> tools maintainer, and Keir is the committer of last resort.

Actually I don't have commit access to ioemu. I'm not a maintainer of it in
any way.

 -- Keir

> Cheers,
> 
> Tim.

Re: [PATCH] ioemu: build fixes for netbsd packaging

[Ian Jackson]

Christoph Egger writes ("Re: [Xen-devel] [PATCH] ioemu: build fixes for netbsd packaging"):
> 
> Ian Campbell: There is no response from Ian Jackson at all.
> Can you commit it before Xen 4.1.1 release, please? Thanks.

I'm afraid I've been putting off replying to you about this one.  I
think it's a pretty big and ugly patch.  I would rather not make these
kind of wholesale changes to the old qemu-xen at this point.

This is particularly true given that this is now effectively a
nearly-dead branch, which we will be maintaining for backward
compatibility only.

Ian.

Re: [PATCH] ioemu: build fixes for netbsd packaging

[Christoph Egger]

On 05/24/11 12:47, Ian Jackson wrote:
> Christoph Egger writes ("Re: [Xen-devel] [PATCH] ioemu: build fixes for netbsd packaging"):
>>
>> Ian Campbell: There is no response from Ian Jackson at all.
>> Can you commit it before Xen 4.1.1 release, please? Thanks.
>
> I'm afraid I've been putting off replying to you about this one.  I
> think it's a pretty big and ugly patch.  I would rather not make these
> kind of wholesale changes to the old qemu-xen at this point.
>
> This is particularly true given that this is now effectively a
> nearly-dead branch, which we will be maintaining for backward
> compatibility only.

Does that mean Xen 4.1.x will move to upstream qemu
along with xen-unstable?

Christoph

-- 
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Einsteinring 24, 85689 Dornach b. Muenchen
Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632

Re: [PATCH] ioemu: build fixes for netbsd packaging

[Tim Deegan]

At 11:33 +0100 on 24 May (1306236784), Keir Fraser wrote:
> On 24/05/2011 11:29, "Tim Deegan" <Tim.Deegan@citrix.com> wrote:
> 
> > At 11:13 +0100 on 24 May (1306235630), Christoph Egger wrote:
> >> 
> >> Ian Campbell: There is no response from Ian Jackson at all.
> >> Can you commit it before Xen 4.1.1 release, please? Thanks.
> > 
> > Ian Campbell is not the person to ask.  Stefano (cc'd) is the other
> > tools maintainer, and Keir is the committer of last resort.
> 
> Actually I don't have commit access to ioemu. I'm not a maintainer of it in
> any way.

Ah yes, I should have replied to Christoph's other email.  

Tim.

-- 
Tim Deegan <Tim.Deegan@citrix.com>
Principal Software Engineer, Xen Platform Team
Citrix Systems UK Ltd.  (Company #02937203, SL9 0BG)

Re: [PATCH] ioemu: build fixes for netbsd packaging

[Ian Jackson]

Christoph Egger writes ("Re: [Xen-devel] [PATCH] ioemu: build fixes for netbsd packaging"):
> On 05/24/11 12:47, Ian Jackson wrote:
> > I'm afraid I've been putting off replying to you about this one.  I
> > think it's a pretty big and ugly patch.  I would rather not make these
> > kind of wholesale changes to the old qemu-xen at this point.
> >
> > This is particularly true given that this is now effectively a
> > nearly-dead branch, which we will be maintaining for backward
> > compatibility only.
> 
> Does that mean Xen 4.1.x will move to upstream qemu
> along with xen-unstable?

No.

Anyway, even if qemu-xen-unstable wasn't pretty much stopped, we
wouldn't be applying this kind of non-regression Makefile
reorganisation to 4.1 (whether in the xen or qemu trees).

Ian.