diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2019-01-17 17:31:09 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2019-01-19 14:32:12 +0100 |
| commit | e6bcf1e4acc4901c1803cdccc4b9fabfd6d84c90 (patch) | |
| tree | f7b66277175ff0ae6baf093db66ca929dfb2b225 /package | |
| parent | e3d5b384aa67c5562d59e8745fc6c48a9f2a997d (diff) | |
| download | upstream-e6bcf1e4acc4901c1803cdccc4b9fabfd6d84c90.tar.gz upstream-e6bcf1e4acc4901c1803cdccc4b9fabfd6d84c90.tar.bz2 upstream-e6bcf1e4acc4901c1803cdccc4b9fabfd6d84c90.zip | |
build: add ABI_VERSION to binary package names
Add the ABI_VERSION source makefile variable to the binary package basename
and resolve source dependencies on packages with ABI_VERSION set to such
expanded names.
If for example a package specifies DEPENDS:=libopenssl while the OpenSSL
Makefile specifies ABI_VERSION:=1.0.0, the resulting ipk control data
dependency will be "Depends: libopenssl1.0.0" and the libopenssl ipk file
will be called "libopenssl1.0.0_<version>_<arch>.ipk".
The next time a library such as OpenSSL is updated to an incompatible
version, the ABI_VERSION shall be changed accordingly to prevent opkg from
simply upgrading to an incompatible library without considering the
dependencies of already installed packages.
Also introduce another "SourceName" control field which is required by
the newly introduced "scritps/ipkg-remove" to determine the proper related
.ipk files to delete upon buildroot package clean operations.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'package')
| -rw-r--r-- | package/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/Makefile b/package/Makefile index 610d09d6fe..abbf5f91f2 100644 --- a/package/Makefile +++ b/package/Makefile @@ -66,7 +66,7 @@ $(curdir)/install: $(TMP_DIR)/.build $(curdir)/merge $(if $(CONFIG_TARGET_PER_DE rm -rf $(TARGET_DIR) $(TARGET_DIR_ORIG) mkdir -p $(TARGET_DIR)/tmp $(call opkg,$(TARGET_DIR)) install \ - $(call opkg_package_files,$(shell cat $(PACKAGE_INSTALL_FILES) 2>/dev/null)) + $(call opkg_package_files,$(foreach pkg,$(shell cat $(PACKAGE_INSTALL_FILES) 2>/dev/null),$(pkg)$(call GetABISuffix,$(pkg)))) @for file in $(PACKAGE_INSTALL_FILES); do \ [ -s $$file.flags ] || continue; \ for flag in `cat $$file.flags`; do \ @@ -84,7 +84,7 @@ $(curdir)/index: FORCE mkdir -p $$d; \ cd $$d || continue; \ $(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages.manifest; \ - grep -vE '^(Maintainer|LicenseFiles|Source|Require)' Packages.manifest > Packages && \ + grep -vE '^(Maintainer|LicenseFiles|Source|SourceName|Require)' Packages.manifest > Packages && \ gzip -9nc Packages > Packages.gz; \ ); done ifdef CONFIG_SIGNED_PACKAGES |