Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move trusty check and locales-all fix inside source-debian-quilt-copy-in

Browse Source
This commit is contained in:
unman 2017-02-13 22:25:47 +00:00
parent 32dc1ad809
commit 38f44417d6
No known key found for this signature in database
GPG Key ID: FDD1B8244731B36C
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.builder
View File

@ -10,13 +10,12 @@ ifeq ($(PACKAGE_SET),vm)
ARCH_BUILD_DIRS := archlinux ARCH_BUILD_DIRS := archlinux
endif endif
ifeq ($(DIST),trusty)
$(shell sed -i /locales-all,/d $(CHROOT_DIR)/$(DIST_SRC)/debian/control)
endif
source-debian-quilt-copy-in: VERSION = $(shell cat $(ORIG_SRC)/version) source-debian-quilt-copy-in: VERSION = $(shell cat $(ORIG_SRC)/version)
source-debian-quilt-copy-in: ORIG_FILE = "$(CHROOT_DIR)/$(DIST_SRC)/../qubes-core-agent_$(VERSION).orig.tar.gz" source-debian-quilt-copy-in: ORIG_FILE = "$(CHROOT_DIR)/$(DIST_SRC)/../qubes-core-agent_$(VERSION).orig.tar.gz"
source-debian-quilt-copy-in: source-debian-quilt-copy-in:
if [ $(DIST) == trusty ] ; then \
sed -i /locales-all/d $(CHROOT_DIR)/$(DIST_SRC)/debian/control ;\
fi
-$(shell $(ORIG_SRC)/debian-quilt $(ORIG_SRC)/series-debian-vm.conf $(CHROOT_DIR)/$(DIST_SRC)/debian/patches) -$(shell $(ORIG_SRC)/debian-quilt $(ORIG_SRC)/series-debian-vm.conf $(CHROOT_DIR)/$(DIST_SRC)/debian/patches)
tar cfz $(ORIG_FILE) --exclude-vcs --exclude=rpm --exclude=pkgs --exclude=deb --exclude=debian -C $(CHROOT_DIR)/$(DIST_SRC) . tar cfz $(ORIG_FILE) --exclude-vcs --exclude=rpm --exclude=pkgs --exclude=deb --exclude=debian -C $(CHROOT_DIR)/$(DIST_SRC) .