From ca37ec4630bd952703a201dc5a9d85cba64b3dd8 Mon Sep 17 00:00:00 2001 From: Mark Pryor Date: Sat, 9 Mar 2024 14:27:45 -0800 Subject: [PATCH] xen 4.18.0-1~ng12u3.6 time64 prep --- debian/changelog | 9 +++++++++ debian/control | 16 +++++++++++++--- debian/control.md5sum | 2 +- debian/rules.real | 38 ++++++++++++++++++++++++++++++++------ 4 files changed, 55 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 760e06a..69efcd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +xen (4.18.0-1~ng12u3.6) bookworm; urgency=medium + + * Non-maintainer upload. + * ng (next generation) packaging, preparing for time64 transition + * split libs out xen-utils- into a new pkg, libxenfsutl4.18 + * rename libxen- as libxenmisc4.18 + + -- Mark Pryor Fri, 08 Mar 2024 14:11:41 -0800 + xen (4.18.0-1+deb12u3.5) bookworm; urgency=medium * Non-maintainer upload. diff --git a/debian/control b/debian/control index 4d2b368..445ed05 100644 --- a/debian/control +++ b/debian/control @@ -42,9 +42,11 @@ Build-Depends: autotools-dev, debhelper (>> 10), dpkg-dev (>= 1.16.0~), lsb-rele XS-Python-Version: 3.9, 3.10, 3.11 XS-X-Python3-Version: >= 3.11 -Package: libxen-4.18 +Package: libxenmisc4.18 Architecture: amd64 arm64 armhf i386 Section: libs +Replaces: libxen-4.18 +Breaks: libxen-4.18 (<< ${source:Version}) Depends: ${shlibs:Depends}, ${misc:Depends} Description: Public libs for Xen This package contains the shared toolstack libraries for Xen. @@ -66,10 +68,18 @@ Description: helper for qemu & libxenstore This package contains a depends to XenStore. . Multi-Arch: same +Package: libxenfsutl4.18 +Architecture: amd64 arm64 armhf i386 +Section: libs +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: xen-utils-4.18 companion libs + This package contains a depends to XenStore. . +Multi-Arch: same + Package: libxen-dev Architecture: amd64 arm64 armhf i386 Section: libdevel -Depends: libxen-4.18 (= ${binary:Version}), libxenstore4.0 (= ${binary:Version}), ${misc:Depends} +Depends: libxenmisc4.18 (= ${binary:Version}), libxenstore4.0 (= ${binary:Version}), ${misc:Depends} Description: Public headers and libs for Xen This package contains the public headers and static libraries for Xen. . @@ -120,7 +130,7 @@ Description: Xen administrative tools - common files Package: xen-utils-4.18 Architecture: amd64 arm64 armhf i386 Provides: xen-utils -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, xen-utils-common (>= ${source:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, xen-utils-common (>= ${source:Version}), libxenfsutl4.18 (>= ${source:Version}) Recommends: bridge-utils, libc6-xen [i386], xen-hypervisor-4.18, qemuu Suggests: seabios [i386 amd64], grub-xen-host [i386 amd64] Description: XEN administrative tools diff --git a/debian/control.md5sum b/debian/control.md5sum index 951ce38..341d9f5 100644 --- a/debian/control.md5sum +++ b/debian/control.md5sum @@ -1,4 +1,4 @@ -e97a59285fdf979069a86440bb62623a debian/changelog +d3320ce537629559b4ee501614e007dd debian/changelog dc7b5d9f0538e3180af4e9aff9b0bd57 debian/bin/gencontrol.py 347121f66cf9eb59825d2fd1c7b498f3 debian/templates/control.main.in a15fa64ce6deead28d33c1581b14dba7 debian/templates/xen-hypervisor.postinst.in diff --git a/debian/rules.real b/debian/rules.real index a58e037..10cb076 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -17,7 +17,7 @@ export DEB_BUILD_OPTIONS=noddebs export CONFIG_TESTS=n export XEN_SYSTEMD_DIR export FLASK_POLICY=y -export DEBUG_XENPERF=y +export DEBUG_XENPERF=n export PANDOC= export FIG2DEV= export EFI_VENDOR=debian @@ -32,6 +32,7 @@ export XTRACT_CONFIGS := $(shell sh debian/extract-config-opts \ $(DEB_HOST_ARCH_OS)-$(DEB_HOST_ARCH) debian/templates/control.source.in) binary-arch-arch: install-libxen_$(ARCH) +binary-arch-arch: install-libxenfsutl_$(ARCH) binary-arch-arch: install-libxen-dev_$(ARCH) binary-arch-arch: install-libxenstore_$(ARCH) binary-arch-arch: install-libxentoolcore_$(ARCH) @@ -375,7 +376,7 @@ endif install-libxen_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH) -install-libxen_$(ARCH): PACKAGE_NAME = libxen-$(VERSION) +install-libxen_$(ARCH): PACKAGE_NAME = libxenmisc$(VERSION) install-libxen_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME) install-libxen_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH) install-libxentoolcore_$(ARCH) install-libxenstore_$(ARCH) dh_testdir @@ -453,7 +454,7 @@ install-utils_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH) install-libxen_$(ARCH # fi; install -D -m644 $(SOURCE_DIR)/tools/firmware/xen-dir/xen-root/xen/xen.gz $(PACKAGE_DIR)/usr/lib/xen-$(VERSION)/boot/xen-shim.gz install -D -m644 $(SOURCE_DIR)/tools/firmware/xen-dir/xen-root/xen/xen $(PACKAGE_DIR)/usr/lib/xen-$(VERSION)/boot/xen-shim - dh_install -Xqemu-dm --sourcedir=$(DIR) usr/lib/xen-$(VERSION) + dh_install -Xqemu-dm --sourcedir=$(DIR) usr/lib/xen-$(VERSION)/{bin,boot,lib/python} if [ ! -f $(DIR)/etc/bash_completion.d/xl-$(VERSION) ]; then \ ( cd $(DIR)/etc/bash_completion.d; mv xl xl-$(VERSION) ) ; \ fi; @@ -469,9 +470,34 @@ endif dh_python3 -V$(shell py3versions -rv) /usr/lib/xen-$(VERSION)/lib/python dh_strip -Xxen-shim -Xhvmloader dh_makeshlibs -V +# dh_shlibdeps -l/usr/lib/xen-4.18/lib --dpkg-shlibdeps-params=--ignore-missing-info + +$(MAKE_SELF) install-base + +install-libxenfsutl_$(ARCH): SOURCE_DIR = $(BUILD_DIR)/build-utils_$(ARCH) +install-libxenfsutl_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH) +install-libxenfsutl_$(ARCH): PACKAGE_NAME = libxenfsutl$(VERSION) +install-libxenfsutl_$(ARCH): PACKAGE_DIR = debian/$(PACKAGE_NAME) +install-libxenfsutl_$(ARCH): DH_OPTIONS = -p$(PACKAGE_NAME) +install-libxenfsutl_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH) install-libxen_$(ARCH) + dh_testdir + dh_testroot + dh_prep + install -D -m644 debian/xen-utils.NEWS $(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)/NEWS + install -D -m644 debian/xen-utils.README.Debian $(PACKAGE_DIR)/usr/share/doc/$(PACKAGE_NAME)/README.Debian + dh_install -Xqemu-dm --sourcedir=$(DIR) usr/lib/xen-$(VERSION)/lib/fs ; + dh_install -Xqemu-dm --sourcedir=$(DIR) usr/lib/xen-$(VERSION)/lib/libfsimage*.so* ; +# if [ -f $(SOURCE_DIR)/qemut/VERSION ]; then \ +# dh_install --sourcedir=$(DIR) usr/share/xen/qemu ; \ +# fi; + dh_install debian/templates/xen-utils.bug/* usr/share/bug/$(PACKAGE_NAME) ; + dh_lintian + ( echo -n "misc:Built-Using="; dpkg-query -f='$${source:Package} (= $${source:Version}), ' -W ipxe-qemu seabios; echo ) >> debian/$(PACKAGE_NAME).substvars + dh_strip -Xxen-shim -Xhvmloader + dh_makeshlibs -V dh_shlibdeps -l/usr/lib/xen-4.18/lib --dpkg-shlibdeps-params=--ignore-missing-info +$(MAKE_SELF) install-base + install-qemuu_$(ARCH): SOURCE_DIR = $(BUILD_DIR)/build-utils_$(ARCH) install-qemuu_$(ARCH): DIR = $(BUILD_DIR)/install-qemuu_$(ARCH) install-qemuu_$(ARCH): PACKAGE_NAME = qemuu @@ -494,7 +520,7 @@ install-qemuu_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH) install-libxen_$(ARCH dh_strip -Xqemu-xen dh_makeshlibs -V dh_shlibdeps - +$(MAKE_SELF) install-base GENCONTROL_ARGS=-v8.0.4+0-1+deb12u3.5 + +$(MAKE_SELF) install-base GENCONTROL_ARGS=-v8.0.4+0-1~ng12u3.6 install-qemut_$(ARCH): SOURCE_DIR = $(BUILD_DIR)/build-utils_$(ARCH) install-qemut_$(ARCH): DIR = $(BUILD_DIR)/install-utils_$(ARCH) @@ -520,7 +546,7 @@ install-qemut_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH) install-libxen_$(ARCH dh_strip -Xppc -Xopenbios dh_makeshlibs -V dh_shlibdeps - +$(MAKE_SELF) install-base GENCONTROL_ARGS=-v0.10.2+0-1+deb12u3.5 + +$(MAKE_SELF) install-base GENCONTROL_ARGS=-v0.10.2+0-1~ng12u3.6 install-utils-common: SOURCE_DIR = $(BUILD_DIR)/build-docs install-utils-common: DIR = $(BUILD_DIR)/install-utils-common @@ -575,7 +601,7 @@ install-qemuu-uncom_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH) $(STAMPS_DIR)/i dh_install --sourcedir=$(DIR) usr/lib/xen-$(VERSION)/bin/qemu-keymap usr/bin/ dh_strip dh_shlibdeps - +$(MAKE_SELF) install-base GENCONTROL_ARGS=-v8.0.4+0-1+deb12u3.5 + +$(MAKE_SELF) install-base GENCONTROL_ARGS=-v8.0.4+0-1~ng12u3.6 # vim: filetype=make -- 2.39.2