[pkgsrc/trunk]: pkgsrc/sysutils/xentools3 Enable the build of pygrub.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/sysutils/xentools3 Enable the build of pygrub.
From: hannken <hannken%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 05:51:16 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/6e6af6477cf8
branches:  trunk
changeset: 539315:6e6af6477cf8
user:      hannken <hannken%pkgsrc.org@localhost>
date:      Mon Mar 03 16:45:27 2008 +0000

description:
Enable the build of pygrub.

Ok: Manuel Bouyer <bouyer%netbsd.org@localhost>

diffstat:

 sysutils/xentools3/Makefile         |   4 +-
 sysutils/xentools3/PLIST            |  28 +++++++++++++++++-
 sysutils/xentools3/distinfo         |  20 ++++++++++-
 sysutils/xentools3/files/xend.sh    |   3 +-
 sysutils/xentools3/patches/patch-aa |  20 +++--------
 sysutils/xentools3/patches/patch-cj |  20 +++++++++---
 sysutils/xentools3/patches/patch-cy |  13 ++++++++
 sysutils/xentools3/patches/patch-cz |  15 +++++++++
 sysutils/xentools3/patches/patch-da |  36 ++++++++++++++++++++++
 sysutils/xentools3/patches/patch-db |  16 ++++++++++
 sysutils/xentools3/patches/patch-dc |  31 +++++++++++++++++++
 sysutils/xentools3/patches/patch-dd |  37 +++++++++++++++++++++++
 sysutils/xentools3/patches/patch-de |  13 ++++++++
 sysutils/xentools3/patches/patch-df |  31 +++++++++++++++++++
 sysutils/xentools3/patches/patch-dg |  41 ++++++++++++++++++++++++++
 sysutils/xentools3/patches/patch-dh |  22 ++++++++++++++
 sysutils/xentools3/patches/patch-di |  58 +++++++++++++++++++++++++++++++++++++
 sysutils/xentools3/patches/patch-dj |  46 +++++++++++++++++++++++++++++
 sysutils/xentools3/patches/patch-dk |  13 ++++++++
 sysutils/xentools3/patches/patch-dl |  40 +++++++++++++++++++++++++
 20 files changed, 482 insertions(+), 25 deletions(-)

diffs (truncated from 691 to 300 lines):

diff -r edeb19211bd9 -r 6e6af6477cf8 sysutils/xentools3/Makefile
--- a/sysutils/xentools3/Makefile       Mon Mar 03 16:27:41 2008 +0000
+++ b/sysutils/xentools3/Makefile       Mon Mar 03 16:45:27 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/02/17 16:29:03 bouyer Exp $
+# $NetBSD: Makefile,v 1.8 2008/03/03 16:45:27 hannken Exp $
 #
 
 VERSION=               3.1.3
@@ -104,6 +104,7 @@
 SUBST_CLASSES+=                prefix
 SUBST_STAGE.prefix=    pre-configure
 SUBST_FILES.prefix=    python/xen/util/auxbin.py
+SUBST_FILES.prefix+=   python/xen/xend/osdep.py
 SUBST_FILES.prefix+=   misc/xen-python-path
 SUBST_SED.prefix=      -e "s,@PREFIX@,${PREFIX},g"
 
@@ -194,6 +195,7 @@
 .include "../../textproc/py-xml/buildlink3.mk"
 #.include "../../devel/zlib/buildlink3.mk"
 #.include "../../www/curl/buildlink3.mk"
+.include "../../devel/py-curses/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r edeb19211bd9 -r 6e6af6477cf8 sysutils/xentools3/PLIST
--- a/sysutils/xentools3/PLIST  Mon Mar 03 16:27:41 2008 +0000
+++ b/sysutils/xentools3/PLIST  Mon Mar 03 16:45:27 2008 +0000
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/06/14 19:39:45 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/03/03 16:45:27 hannken Exp $
+bin/pygrub
 bin/readnotes
 bin/xc_restore
 bin/xc_save
@@ -14,10 +15,21 @@
 bin/xenstore-rm
 bin/xenstore-write
 bin/xen-detect
+include/fsimage.h
+include/fsimage_plugin.h
+include/fsimage_grub.h
 include/xenctrl.h
 include/xenguest.h
 include/xs.h
 include/xs_lib.h
+lib/fs/ext2fs/fsimage.so
+lib/fs/fat/fsimage.so
+lib/fs/iso9660/fsimage.so
+lib/fs/reiserfs/fsimage.so
+lib/fs/ufs/fsimage.so
+lib/libfsimage.so
+lib/libfsimage.so.1.0
+lib/libfsimage.so.1.0.0
 lib/libxenctrl.a
 lib/libxenctrl.so
 lib/libxenctrl.so.3.0
@@ -34,6 +46,13 @@
 man/man1/xm.1
 man/man5/xend-config.sxp.5
 man/man5/xmdomain.cfg.5
+${PYSITELIB}/fsimage.so
+${PYSITELIB}/grub/GrubConf.py
+${PYSITELIB}/grub/GrubConf.pyc
+${PYSITELIB}/grub/LiloConf.py
+${PYSITELIB}/grub/LiloConf.pyc
+${PYSITELIB}/grub/__init__.py
+${PYSITELIB}/grub/__init__.pyc
 ${PYSITELIB}/xen/__init__.py
 ${PYSITELIB}/xen/__init__.pyc
 ${PYSITELIB}/xen/lowlevel/__init__.py
@@ -352,8 +371,15 @@
 share/examples/xen/xmexample2
 share/examples/xen/xmexample3
 share/xen/create.dtd
+@dirrm lib/fs/ext2fs
+@dirrm lib/fs/fat
+@dirrm lib/fs/iso9660
+@dirrm lib/fs/reiserfs
+@dirrm lib/fs/ufs
+@dirrm lib/fs
 @dirrm share/xen
 @dirrm share/examples/xen
+@dirrm ${PYSITELIB}/grub
 @dirrm ${PYSITELIB}/xen/xm/tests
 @dirrm ${PYSITELIB}/xen/xm
 @dirrm ${PYSITELIB}/xen/xend/xenstore/tests
diff -r edeb19211bd9 -r 6e6af6477cf8 sysutils/xentools3/distinfo
--- a/sysutils/xentools3/distinfo       Mon Mar 03 16:27:41 2008 +0000
+++ b/sysutils/xentools3/distinfo       Mon Mar 03 16:45:27 2008 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2008/02/17 16:29:03 bouyer Exp $
+$NetBSD: distinfo,v 1.6 2008/03/03 16:45:27 hannken Exp $
 
 SHA1 (xen-3.1.3-src.tgz) = 87b370df928feda599bbc7076e7a4589f67355c8
 RMD160 (xen-3.1.3-src.tgz) = b26b71e0422db7aece60aa4dd9f9c8d34affd0c7
 Size (xen-3.1.3-src.tgz) = 6891760 bytes
-SHA1 (patch-aa) = 86a6c9c2a43da76a5746835e13646b24e6992070
+SHA1 (patch-aa) = dca8b8de73b9bdbb17f8245224575eb881cdf00d
 SHA1 (patch-ab) = dcafc8b6c4cd1e4dfc6f4ec806fd8076b3104b86
 SHA1 (patch-ac) = 4eb0f474d4e3a685788c1ce92c0b407dc3d7a855
 SHA1 (patch-ad) = ec36d712925ddf06aac7d6393ad818a51c4363f3
@@ -31,7 +31,7 @@
 SHA1 (patch-cf) = 05c5e86d33d31a2216c2751a2bf684c8d5d06746
 SHA1 (patch-cg) = 36073c7327f187702203108b3e7596178aac3327
 SHA1 (patch-ch) = ebe2aedf1ecd1dce66f4a8a25ef5e83ee1d4c60d
-SHA1 (patch-cj) = 166e2190a31bba842da1111310ba7b1ad35a5d81
+SHA1 (patch-cj) = 5227c180e9ec2cf7146ade6f250f6bdff8f2bda1
 SHA1 (patch-ck) = 3783d9b4b9344670bae2f35e2ac7f11e2ec9ce7b
 SHA1 (patch-cm) = 802d395f1dc391a827487bbc9fcfe2bbd6af07de
 SHA1 (patch-cn) = 40ae04194cca94b112133e962d4cf7487412925a
@@ -45,3 +45,17 @@
 SHA1 (patch-cv) = 1fea2a1cd139e2e46655622ad5f02b37e1501e0b
 SHA1 (patch-cw) = 7fad0847bb87beddb9330d067132d1f7fc784222
 SHA1 (patch-cx) = eed56d9e4535f19a6fc2474765d85135fce15e63
+SHA1 (patch-cy) = d8f7b3c7c1fcacb273fed2799b287de8f11a1399
+SHA1 (patch-cz) = c40c44d85a6662231328ef3ae86367b63f066632
+SHA1 (patch-da) = 97c888dce1c0ccc61d3750e2e3eefcb44f2eb4c6
+SHA1 (patch-db) = 5f4262ce891d5109dab2418664eb05f58a8aa535
+SHA1 (patch-dc) = 10875cd9267ea5d86b1402ca7f493c67cb57a739
+SHA1 (patch-dd) = 66446a6d8293aa52da11dbd28455ae856c184d16
+SHA1 (patch-de) = 7cf7fb63984833e8c6110dbbb4de82a6d5e91d32
+SHA1 (patch-df) = e1d10ddb899d24d727d60ca49f5b382566d65d2c
+SHA1 (patch-dg) = 298bbd22362ab880fea378935a99aef6f4613f27
+SHA1 (patch-dh) = 33716556ab6e878dde1f9b5771b7ce231a3805f9
+SHA1 (patch-di) = 9d6a5acde713e0b7471adbea2d55e55b3ac77881
+SHA1 (patch-dj) = 354ee3ceb1b5ba9b02091de916c328e5a062cb87
+SHA1 (patch-dk) = 5685f52835885635eacd305945653f817bbe8a2a
+SHA1 (patch-dl) = 480b515da8773e4d3cfc305d74f833f16bb12750
diff -r edeb19211bd9 -r 6e6af6477cf8 sysutils/xentools3/files/xend.sh
--- a/sysutils/xentools3/files/xend.sh  Mon Mar 03 16:27:41 2008 +0000
+++ b/sysutils/xentools3/files/xend.sh  Mon Mar 03 16:45:27 2008 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: xend.sh,v 1.1.1.1 2007/06/14 19:39:45 bouyer Exp $
+# $NetBSD: xend.sh,v 1.2 2008/03/03 16:45:27 hannken Exp $
 #
 # PROVIDE: xend
 # REQUIRE: disks network
@@ -22,6 +22,7 @@
                exit 1
        fi
        mkdir -p /var/run/xend || exit 1
+       mkdir -p /var/run/xend/boot || exit 1
        mkdir -p /var/run/xenstored || exit 1
 }
 
diff -r edeb19211bd9 -r 6e6af6477cf8 sysutils/xentools3/patches/patch-aa
--- a/sysutils/xentools3/patches/patch-aa       Mon Mar 03 16:27:41 2008 +0000
+++ b/sysutils/xentools3/patches/patch-aa       Mon Mar 03 16:45:27 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/06/14 19:39:45 bouyer Exp $
+$NetBSD: patch-aa,v 1.2 2008/03/03 16:45:27 hannken Exp $
 
---- Makefile.orig      2007-05-18 16:45:21.000000000 +0200
-+++ Makefile   2007-05-27 13:32:39.000000000 +0200
-@@ -5,27 +5,18 @@
+--- Makefile.orig      2008-01-31 11:06:54.000000000 +0100
++++ Makefile   2008-02-29 16:58:47.000000000 +0100
+@@ -5,19 +5,12 @@ SUBDIRS-y :=
  SUBDIRS-y += libxc
  SUBDIRS-y += xenstore
  SUBDIRS-y += misc
@@ -19,18 +19,10 @@
  SUBDIRS-y += xenstat
 -SUBDIRS-y += libaio
 -SUBDIRS-y += blktap
--SUBDIRS-y += libfsimage
+ SUBDIRS-y += libfsimage
  SUBDIRS-$(XENFB_TOOLS) += xenfb
  SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
- 
- # These don't cross-compile
- ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
- SUBDIRS-$(PYTHON_TOOLS) += python
--SUBDIRS-$(PYTHON_TOOLS) += pygrub
- endif
- 
- .PHONY: all
-@@ -33,34 +24,27 @@
+@@ -33,34 +26,27 @@ all: check
        @set -e; for subdir in $(SUBDIRS-y); do \
                $(MAKE) -C $$subdir $@; \
        done
diff -r edeb19211bd9 -r 6e6af6477cf8 sysutils/xentools3/patches/patch-cj
--- a/sysutils/xentools3/patches/patch-cj       Mon Mar 03 16:27:41 2008 +0000
+++ b/sysutils/xentools3/patches/patch-cj       Mon Mar 03 16:45:27 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-cj,v 1.1.1.1 2007/06/14 19:39:46 bouyer Exp $
+$NetBSD: patch-cj,v 1.2 2008/03/03 16:45:27 hannken Exp $
 
---- python/xen/xend/osdep.py.orig      2007-04-25 22:22:18.000000000 +0200
-+++ python/xen/xend/osdep.py   2007-04-25 22:23:03.000000000 +0200
-@@ -22,9 +22,11 @@
+--- python/xen/xend/osdep.py.orig      2008-01-31 11:06:54.000000000 +0100
++++ python/xen/xend/osdep.py   2008-03-02 13:38:39.000000000 +0100
+@@ -22,15 +22,18 @@ import os
  _scripts_dir = {
      "Linux": "/etc/xen/scripts",
      "SunOS": "/usr/lib/xen/scripts",
@@ -14,10 +14,20 @@
      "Linux": True,
      "SunOS": False,
  }
-@@ -32,5 +34,5 @@
+ 
+ _pygrub_path = {
+-    "SunOS": "/usr/lib/xen/bin/pygrub"
++    "SunOS": "/usr/lib/xen/bin/pygrub",
++    "NetBSD": "@PREFIX@/bin/pygrub",
+ }
+ 
+ _netback_type = {
+@@ -93,7 +96,7 @@ _balloon_stat = {
  def _get(var, default=None):
      return var.get(os.uname()[0], default)
  
 -scripts_dir = _get(_scripts_dir, "/etc/xen/scripts")
 +scripts_dir = _get(_scripts_dir, "@XENDCONFDIR@/scripts")
  xend_autorestart = _get(_xend_autorestart)
+ pygrub_path = _get(_pygrub_path, "/usr/bin/pygrub")
+ netback_type = _get(_netback_type, "netfront")
diff -r edeb19211bd9 -r 6e6af6477cf8 sysutils/xentools3/patches/patch-cy
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/xentools3/patches/patch-cy       Mon Mar 03 16:45:27 2008 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-cy,v 1.1 2008/03/03 16:45:27 hannken Exp $
+
+--- libfsimage/Makefile.orig   2008-01-31 10:06:54.000000000 +0000
++++ libfsimage/Makefile        2008-03-01 11:52:28.000000000 +0000
+@@ -2,7 +2,7 @@ XEN_ROOT = ../..
+ include $(XEN_ROOT)/tools/Rules.mk
+ 
+ SUBDIRS-y = common ufs reiserfs iso9660 fat
+-SUBDIRS-y += $(shell ./check-libext2fs)
++SUBDIRS-y += $(shell ${SHELL} check-libext2fs)
+ 
+ .PHONY: all
+ all install clean:
diff -r edeb19211bd9 -r 6e6af6477cf8 sysutils/xentools3/patches/patch-cz
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/xentools3/patches/patch-cz       Mon Mar 03 16:45:27 2008 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-cz,v 1.1 2008/03/03 16:45:27 hannken Exp $
+
+--- libfsimage/Rules.mk.orig   2008-01-31 10:06:54.000000000 +0000
++++ libfsimage/Rules.mk        2008-03-01 11:52:28.000000000 +0000
+@@ -20,8 +20,8 @@ fs-all: $(FSLIB)
+ 
+ .PHONY: fs-install
+ fs-install: fs-all
+-      $(INSTALL_DIR) $(DESTDIR)/usr/$(FSDIR)
+-      $(INSTALL_PROG) $(FSLIB) $(DESTDIR)/usr/$(FSDIR)
++      $(BSD_INSTALL_LIB_DIR) $(PREFIX)/lib/fs/$(FS)
++      $(BSD_INSTALL_LIB) $(FSLIB) $(PREFIX)/lib/fs/$(FS)
+ 
+ $(FSLIB): $(PIC_OBJS)
+       $(CC) $(CFLAGS) $(LDFLAGS) $(SHLIB_CFLAGS) -o $@ $^ -lfsimage $(FS_LIBDEPS)
diff -r edeb19211bd9 -r 6e6af6477cf8 sysutils/xentools3/patches/patch-da
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/xentools3/patches/patch-da       Mon Mar 03 16:45:27 2008 +0000
@@ -0,0 +1,36 @@
+$NetBSD: patch-da,v 1.1 2008/03/03 16:45:27 hannken Exp $
+
+--- libfsimage/common/Makefile.orig    2008-01-31 10:06:54.000000000 +0000
++++ libfsimage/common/Makefile 2008-03-01 11:52:28.000000000 +0000
+@@ -4,7 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk
+ MAJOR = 1.0
+ MINOR = 0
+ 
+-CFLAGS += -Werror -Wp,-MD,.$(@F).d
++CFLAGS += -Werror -Wp,-MD,.$(@F).d -DFSIMAGE_FSDIR=\"$(PREFIX)/lib/fs\"
+ DEPS = .*.d
+ 
+ LDFLAGS-$(CONFIG_SunOS) = -Wl,-M -Wl,mapfile-SunOS
+@@ -22,14 +22,14 @@ all: $(LIB)
+ 
+ .PHONY: install
+ install: all
+-      [ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR)
+-      [ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include
+-      $(INSTALL_PROG) libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)
+-      ln -sf libfsimage.so.$(MAJOR).$(MINOR) $(DESTDIR)/usr/$(LIBDIR)/libfsimage.so.$(MAJOR)
+-      ln -sf libfsimage.so.$(MAJOR) $(DESTDIR)/usr/$(LIBDIR)/libfsimage.so
+-      $(INSTALL_DATA) fsimage.h $(DESTDIR)/usr/include
+-      $(INSTALL_DATA) fsimage_plugin.h $(DESTDIR)/usr/include
+-      $(INSTALL_DATA) fsimage_grub.h $(DESTDIR)/usr/include
++      $(BSD_INSTALL_LIB_DIR) $(PREFIX)/lib
++      $(BSD_INSTALL_DATA_DIR) $(PREFIX)/include
++      $(BSD_INSTALL_LIB) libfsimage.so.$(MAJOR).$(MINOR) $(PREFIX)/lib
++      ln -sf libfsimage.so.$(MAJOR).$(MINOR) $(PREFIX)/lib/libfsimage.so.$(MAJOR)
++      ln -sf libfsimage.so.$(MAJOR) $(PREFIX)/lib/libfsimage.so
++      $(BSD_INSTALL_DATA) fsimage.h $(PREFIX)/include
++      $(BSD_INSTALL_DATA) fsimage_plugin.h $(PREFIX)/include
++      $(BSD_INSTALL_DATA) fsimage_grub.h $(PREFIX)/include
+ 
+ clean distclean:
+       rm -f $(PIC_OBJS) $(LIB)
diff -r edeb19211bd9 -r 6e6af6477cf8 sysutils/xentools3/patches/patch-db
Prev by Date: [pkgsrc/trunk]: pkgsrc/www Update links* to 2.1.0.33:
Next by Date: [pkgsrc/trunk]: pkgsrc Remove gaim and related packages. The gaim project was...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/www Update links* to 2.1.0.33:
Next by Thread: [pkgsrc/trunk]: pkgsrc Remove gaim and related packages. The gaim project was...
Indexes:
Home | Main Index | Thread Index | Old Index