From fb2c6d12c1843ecb9e2d66dc88ee9e1196149083 Mon Sep 17 00:00:00 2001 From: TheRealKeto Date: Fri, 13 Jan 2023 20:00:00 -0500 Subject: [PATCH 1/3] libvde: Partially fix packaging Signed-off-by: TheRealKeto --- makefiles/libvde.mk | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/makefiles/libvde.mk b/makefiles/libvde.mk index 8e84fcbfee..93f73ce218 100644 --- a/makefiles/libvde.mk +++ b/makefiles/libvde.mk @@ -30,15 +30,15 @@ endif libvde-package: libvde-stage # libvde.mk Package Structure rm -rf $(BUILD_DIST)/libvde{0,-dev} $(BUILD_DIST)/libvdeplug{2,-dev} $(BUILD_DIST)/vde2{,-cryptcab} - mkdir -p $(BUILD_DIST)/libvde0/{etc/vde2,usr/lib} \ - $(BUILD_DIST)/libvde-dev/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/{include,lib/pkgconfig} \ - $(BUILD_DIST)/libvdeplug2/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/lib \ - $(BUILD_DIST)/libvdeplug-dev/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/{include,lib/pkgconfig} \ - $(BUILD_DIST)/vde2/{etc/vde2,usr/lib/vde2/vde_l3} \ - $(BUILD_DIST)/vde2-cryptcab/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/{bin,share/man/man1} + mkdir -p $(BUILD_DIST)/libvde0/{$(MEMO_PREFIX)/etc/vde2,$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/lib} \ + $(BUILD_DIST)/libvde-dev/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/{include,lib/pkgconfig} \ + $(BUILD_DIST)/libvdeplug2/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/lib \ + $(BUILD_DIST)/libvdeplug-dev/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/{include,lib/pkgconfig} \ + $(BUILD_DIST)/vde2/{$(MEMO_PREFIX)/etc/vde2,$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/lib/vde2/vde_l3} \ + $(BUILD_DIST)/vde2-cryptcab/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/{bin,share/man/man1} # libvde.mk Prep libvde0 - cp -a $(BUILD_STAGE)/libvde/etc/vde2/libvdemgmt $(BUILD_DIST)/libvde0/etc/vde2 + cp -a $(BUILD_STAGE)/libvde/$(MEMO_PREFIX)/etc/vde2/libvdemgmt $(BUILD_DIST)/libvde0/$(MEMO_PREFIX)/etc/vde2 cp -a $(BUILD_STAGE)/libvde/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/lib/{libvdehist,libvdemgmt,libvdesnmp}.0.dylib $(BUILD_DIST)/libvde0/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/lib # libvde.mk Prep libvde-dev @@ -56,10 +56,10 @@ libvde-package: libvde-stage # libvde.mk Prep vde2 cp -a $(BUILD_STAGE)/libvde/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/lib/vde2/vde_l3/{{b,p}fifo,tbf}.so $(BUILD_DIST)/vde2/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/lib/vde2/vde_l3 - cp -a $(BUILD_STAGE)/libvde/etc/vde2/vdecmd $(BUILD_DIST)/vde2/etc/vde2 + cp -a $(BUILD_STAGE)/libvde/$(MEMO_PREFIX)/etc/vde2/vdecmd $(BUILD_DIST)/vde2/$(MEMO_PREFIX)/etc/vde2 cp -a $(BUILD_STAGE)/libvde/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/{bin,share} $(BUILD_DIST)/vde2/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX) - rm -f $(BUILD_DIST)/vde2/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/bin/vde{cmd,kvm,qemu,_cryptcab} - rm -f $(BUILD_DIST)/vde2/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/share/man/man1/vde{cmd,kvm,qemu,_cryptcab}.1 + rm -f $(BUILD_DIST)/vde2/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/bin/vde{cmd,kvm,qemu} + rm -f $(BUILD_DIST)/vde2/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/share/man/man1/vde{cmd,kvm,qemu}.1 # libvde.mk Prep vde2-cryptcab cp -a $(BUILD_STAGE)/libvde/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/bin/vde_cryptcab $(BUILD_DIST)/vde2-cryptcab/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/bin From b4d05fa8560bfaf0c5284e60410249b911be06bf Mon Sep 17 00:00:00 2001 From: TheRealKeto Date: Fri, 13 Jan 2023 20:02:00 -0500 Subject: [PATCH 2/3] libvde: Append suffix when copying manpages Signed-off-by: TheRealKeto --- makefiles/libvde.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefiles/libvde.mk b/makefiles/libvde.mk index 93f73ce218..32165a431b 100644 --- a/makefiles/libvde.mk +++ b/makefiles/libvde.mk @@ -63,7 +63,7 @@ libvde-package: libvde-stage # libvde.mk Prep vde2-cryptcab cp -a $(BUILD_STAGE)/libvde/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/bin/vde_cryptcab $(BUILD_DIST)/vde2-cryptcab/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/bin - cp -a $(BUILD_STAGE)/libvde/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/share/man/man1/vde_cryptcab.1 $(BUILD_DIST)/vde2-cryptcab/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/share/man/man1 + cp -a $(BUILD_STAGE)/libvde/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/share/man/man1/vde_cryptcab.1$(MEMO_MANPAGE_SUFFIX) $(BUILD_DIST)/vde2-cryptcab/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/share/man/man1 # libvde.mk Sign $(call SIGN,libvde0,general.xml) From 565a3b26d3de0d6f6b844511f063de8976faf1d7 Mon Sep 17 00:00:00 2001 From: TheRealKeto Date: Fri, 13 Jan 2023 20:05:00 -0500 Subject: [PATCH 3/3] libvde: Delete duplicate manpages Signed-off-by: TheRealKeto --- makefiles/libvde.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makefiles/libvde.mk b/makefiles/libvde.mk index 32165a431b..21e045853b 100644 --- a/makefiles/libvde.mk +++ b/makefiles/libvde.mk @@ -58,8 +58,8 @@ libvde-package: libvde-stage cp -a $(BUILD_STAGE)/libvde/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/lib/vde2/vde_l3/{{b,p}fifo,tbf}.so $(BUILD_DIST)/vde2/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/lib/vde2/vde_l3 cp -a $(BUILD_STAGE)/libvde/$(MEMO_PREFIX)/etc/vde2/vdecmd $(BUILD_DIST)/vde2/$(MEMO_PREFIX)/etc/vde2 cp -a $(BUILD_STAGE)/libvde/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/{bin,share} $(BUILD_DIST)/vde2/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX) - rm -f $(BUILD_DIST)/vde2/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/bin/vde{cmd,kvm,qemu} - rm -f $(BUILD_DIST)/vde2/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/share/man/man1/vde{cmd,kvm,qemu}.1 + rm -f $(BUILD_DIST)/vde2/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/bin/vde{cmd,kvm,qemu,_cryptcab} + rm -f $(BUILD_DIST)/vde2/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/share/man/man1/vde{cmd,kvm,qemu,_cryptcab}.1$(MEMO_MANPAGE_SUFFIX) # libvde.mk Prep vde2-cryptcab cp -a $(BUILD_STAGE)/libvde/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/bin/vde_cryptcab $(BUILD_DIST)/vde2-cryptcab/$(MEMO_PREFIX)$(MEMO_SUB_PREFIX)/bin