Skip to content

libvde: Fix packaging #1346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

libvde: Fix packaging #1346

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb2c6d1
libvde: Partially fix packaging
TheRealKeto Jan 14, 2023
b4d05fa
libvde: Append suffix when copying manpages
TheRealKeto Jan 14, 2023
565a3b2
libvde: Delete duplicate manpages
TheRealKeto Jan 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions makefiles/libvde.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -56,14 +56,14 @@ 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)/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
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)
Expand Down