Permalink
Browse files

[package] Fix before-package and internal-package.

before-package now depends on DEBIAN/control, and
users can interpose rules between DEBIAN/ creation
and package building (internal-package)\; before-package
used to happen before DEBIAN/ existed because I
didn't really think that case through, somewhat
breaking existing functionality.


git-svn-id: http://svn.howett.net/svn/theos/trunk@419 4410221e-0ddf-4ce3-99c0-2db6c0dbc727
  • Loading branch information...
DHowett committed Jul 18, 2011
1 parent 4868405 commit 9cc39ea5fdb350ca8f9577e4fdde80a613abbdf4
Showing with 3 additions and 1 deletion.
  1. +3 −1 makefiles/package.mk
View
@@ -46,7 +46,9 @@ endif # _THEOS_HAS_STAGING_LAYOUT
$(ECHO_NOTHING)$(THEOS_BIN_PATH)/package_version.sh -c "$(_THEOS_PACKAGE_CONTROL_PATH)" $(if $(PACKAGE_BUILDNAME),-e $(PACKAGE_BUILDNAME),) > "$@"$(ECHO_END)
$(ECHO_NOTHING)echo "Installed-Size: $(shell du $(_THEOS_PLATFORM_DU_EXCLUDE) DEBIAN -ks "$(THEOS_STAGING_DIR)" | cut -f 1)" >> "$@"$(ECHO_END)
-internal-package:: $(THEOS_PACKAGE_DIR) $(_THEOS_ESCAPED_STAGING_DIR)/DEBIAN/control
+before-package:: $(THEOS_PACKAGE_DIR) $(_THEOS_ESCAPED_STAGING_DIR)/DEBIAN/control
+
+internal-package::
$(ECHO_NOTHING)$(FAKEROOT) -r dpkg-deb -b "$(THEOS_STAGING_DIR)" "$(THEOS_PACKAGE_DIR)/$(THEOS_PACKAGE_FILENAME).deb" $(STDERR_NULL_REDIRECT)$(ECHO_END)
else # _THEOS_CAN_PACKAGE == 0

0 comments on commit 9cc39ea

Please sign in to comment.