OpenWrt – Diff between revs 2 and 3
?pathlinks?
| Rev 2 | Rev 3 | |||
|---|---|---|---|---|
| Line 11... | Line 11... | |||
| 11 | |
11 | |
|
| 12 | # invoke ipkg-build with some default options |
12 | # invoke ipkg-build with some default options |
|
| 13 | IPKG_BUILD:= \ |
13 | IPKG_BUILD:= \ |
|
| Line 14... | Line -... | |||
| 14 | $(SCRIPT_DIR)/ipkg-build -c -o 0 -g 0 |
- | ||
| 15 | |
- | ||
| 16 | IPKG_REMOVE:= \ |
- | ||
| 17 | $(SCRIPT_DIR)/ipkg-remove |
14 | $(SCRIPT_DIR)/ipkg-build -c -o 0 -g 0 |
|
| Line 18... | Line 15... | |||
| 18 | |
15 | |
|
| 19 | IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/opkg |
16 | IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/opkg |
|
| 20 | |
17 | |
|
| Line 91... | Line 88... | |||
| 91 | _define=define |
88 | _define=define |
|
| 92 | _endef=endef |
89 | _endef=endef |
|
| Line 93... | Line 90... | |||
| 93 | |
90 | |
|
| 94 | ifeq ($(DUMP),) |
91 | ifeq ($(DUMP),) |
|
| 95 | define BuildTarget/ipkg |
- | ||
| 96 | ABIV_$(1):=$(call GetABISuffix,$(1)) |
92 | define BuildTarget/ipkg |
|
| 97 | PDIR_$(1):=$(call FeedPackageDir,$(1)) |
93 | PDIR_$(1):=$(call FeedPackageDir,$(1)) |
|
| 98 | IPKG_$(1):=$$(PDIR_$(1))/$(1)$$(ABIV_$(1))_$(VERSION)_$(PKGARCH).ipk |
94 | IPKG_$(1):=$$(PDIR_$(1))/$(1)_$(VERSION)_$(PKGARCH).ipk |
|
| 99 | IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg-$(PKGARCH)/$(1) |
95 | IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg-$(PKGARCH)/$(1) |
|
| Line 100... | Line 96... | |||
| 100 | KEEP_$(1):=$(strip $(call Package/$(1)/conffiles)) |
96 | KEEP_$(1):=$(strip $(call Package/$(1)/conffiles)) |
|
| 101 | |
97 | |
|
| Line 150... | Line 146... | |||
| 150 | mkdir -p $(STAGING_DIR_ROOT)/stamp |
146 | mkdir -p $(STAGING_DIR_ROOT)/stamp |
|
| 151 | $(if $(ABI_VERSION),echo '$(ABI_VERSION)' | cmp -s - $(PKG_INFO_DIR)/$(1).version || echo '$(ABI_VERSION)' > $(PKG_INFO_DIR)/$(1).version) |
147 | $(if $(ABI_VERSION),echo '$(ABI_VERSION)' | cmp -s - $(PKG_INFO_DIR)/$(1).version || echo '$(ABI_VERSION)' > $(PKG_INFO_DIR)/$(1).version) |
|
| 152 | $(call locked,$(CP) $(PKG_BUILD_DIR)/.pkgdir/$(1)/. $(STAGING_DIR_ROOT)/,root-copy) |
148 | $(call locked,$(CP) $(PKG_BUILD_DIR)/.pkgdir/$(1)/. $(STAGING_DIR_ROOT)/,root-copy) |
|
| 153 | touch $$@ |
149 | touch $$@ |
|
| Line 154... | Line 150... | |||
| 154 | |
150 | |
|
| 155 | Package/$(1)/DEPENDS := $$(call mergelist,$$(foreach dep,$$(filter-out @%,$$(IDEPEND_$(1))),$$(dep)$$(call GetABISuffix,$$(dep)))) |
151 | Package/$(1)/DEPENDS := $$(call mergelist,$$(filter-out @%,$$(IDEPEND_$(1)))) |
|
| 156 | ifneq ($$(EXTRA_DEPENDS),) |
152 | ifneq ($$(EXTRA_DEPENDS),) |
|
| 157 | Package/$(1)/DEPENDS := $$(EXTRA_DEPENDS)$$(if $$(Package/$(1)/DEPENDS),$$(comma) $$(Package/$(1)/DEPENDS)) |
153 | Package/$(1)/DEPENDS := $$(EXTRA_DEPENDS)$$(if $$(Package/$(1)/DEPENDS),$$(comma) $$(Package/$(1)/DEPENDS)) |
|
| Line 158... | Line 154... | |||
| 158 | endif |
154 | endif |
|
| 159 | |
155 | |
|
| 160 | $(_define) Package/$(1)/CONTROL |
156 | $(_define) Package/$(1)/CONTROL |
|
| 161 | Package: $(1)$$(ABIV_$(1)) |
157 | Package: $(1) |
|
| 162 | Version: $(VERSION) |
158 | Version: $(VERSION) |
|
| 163 | $$(call addfield,Depends,$$(Package/$(1)/DEPENDS) |
159 | $$(call addfield,Depends,$$(Package/$(1)/DEPENDS) |
|
| 164 | )$$(call addfield,Conflicts,$$(call mergelist,$(CONFLICTS)) |
160 | )$$(call addfield,Conflicts,$$(call mergelist,$(CONFLICTS)) |
|
| 165 | )$$(call addfield,Provides,$$(call mergelist,$$(filter-out $(1)$$(ABIV_$(1)),$(PROVIDES)$$(if $$(ABIV_$(1)), $(1) $(foreach provide,$(PROVIDES),$(provide)$$(call GetABISuffix,$(provide)))))) |
161 | )$$(call addfield,Provides,$$(call mergelist,$(PROVIDES)) |
|
| 166 | )$$(call addfield,Alternatives,$$(call mergelist,$(ALTERNATIVES)) |
- | ||
| 167 | )$$(call addfield,Source,$(SOURCE) |
162 | )$$(call addfield,Alternatives,$$(call mergelist,$(ALTERNATIVES)) |
|
| 168 | )$$(call addfield,SourceName,$(1) |
163 | )$$(call addfield,Source,$(SOURCE) |
|
| 169 | )$$(call addfield,License,$(LICENSE) |
164 | )$$(call addfield,License,$(LICENSE) |
|
| 170 | )$$(call addfield,LicenseFiles,$(LICENSE_FILES) |
165 | )$$(call addfield,LicenseFiles,$(LICENSE_FILES) |
|
| 171 | )$$(call addfield,Section,$(SECTION) |
166 | )$$(call addfield,Section,$(SECTION) |
|
| Line 179... | Line 174... | |||
| 179 | |
174 | |
|
| 180 | $$(IPKG_$(1)) : export CONTROL=$$(Package/$(1)/CONTROL) |
175 | $$(IPKG_$(1)) : export CONTROL=$$(Package/$(1)/CONTROL) |
|
| 181 | $$(IPKG_$(1)) : export DESCRIPTION=$$(Package/$(1)/description) |
176 | $$(IPKG_$(1)) : export DESCRIPTION=$$(Package/$(1)/description) |
|
| 182 | $$(IPKG_$(1)) : export PATH=$$(TARGET_PATH_PKG) |
177 | $$(IPKG_$(1)) : export PATH=$$(TARGET_PATH_PKG) |
|
| 183 | $(PKG_INFO_DIR)/$(1).provides $$(IPKG_$(1)): $(STAMP_BUILT) $(INCLUDE_DIR)/package-ipkg.mk |
178 | $(PKG_INFO_DIR)/$(1).provides $$(IPKG_$(1)): $(STAMP_BUILT) $(INCLUDE_DIR)/package-ipkg.mk |
|
| 184 | @rm -rf $$(IDIR_$(1)) $$(if $$(call opkg_package_files,$(1)*),; $$(IPKG_REMOVE) $(1) $$(call opkg_package_files,$(1)*)) |
179 | @rm -rf $$(IDIR_$(1)) $$(call opkg_package_files,$(1)) |
|
| 185 | mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/CONTROL $(PKG_INFO_DIR) |
180 | mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/CONTROL $(PKG_INFO_DIR) |
|
| 186 | $(call Package/$(1)/install,$$(IDIR_$(1))) |
181 | $(call Package/$(1)/install,$$(IDIR_$(1))) |
|
| 187 | $(if $(Package/$(1)/install-overlay),mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/rootfs-overlay) |
182 | $(if $(Package/$(1)/install-overlay),mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/rootfs-overlay) |
|
| 188 | $(call Package/$(1)/install-overlay,$$(IDIR_$(1))/rootfs-overlay) |
183 | $(call Package/$(1)/install-overlay,$$(IDIR_$(1))/rootfs-overlay) |
|
| Line 197... | Line 192... | |||
| 197 | ) | sort -u > $(PKG_INFO_DIR)/$(1).provides |
192 | ) | sort -u > $(PKG_INFO_DIR)/$(1).provides |
|
| 198 | $(if $(PROVIDES),@for pkg in $(filter-out $(1),$(PROVIDES)); do cp $(PKG_INFO_DIR)/$(1).provides $(PKG_INFO_DIR)/$$$$pkg.provides; done) |
193 | $(if $(PROVIDES),@for pkg in $(filter-out $(1),$(PROVIDES)); do cp $(PKG_INFO_DIR)/$(1).provides $(PKG_INFO_DIR)/$$$$pkg.provides; done) |
|
| 199 | $(CheckDependencies) |
194 | $(CheckDependencies) |
|
| Line 200... | Line 195... | |||
| 200 | |
195 | |
|
| 201 | $(RSTRIP) $$(IDIR_$(1)) |
- | ||
| 202 | |
- | ||
| 203 | ifneq ($$(CONFIG_IPK_FILES_CHECKSUMS),) |
- | ||
| 204 | (cd $$(IDIR_$(1)); \ |
- | ||
| 205 | ( \ |
- | ||
| 206 | find . -type f \! -path ./CONTROL/\* -exec sha256sum \{\} \; 2> /dev/null | \ |
- | ||
| 207 | sed 's|\([[:blank:]]\)\./|\1/|' > $$(IDIR_$(1))/CONTROL/files-sha256 \ |
- | ||
| 208 | ) || true \ |
- | ||
| 209 | ) |
- | ||
| 210 | endif |
196 | $(RSTRIP) $$(IDIR_$(1)) |
|
| 211 | (cd $$(IDIR_$(1))/CONTROL; \ |
197 | (cd $$(IDIR_$(1))/CONTROL; \ |
|
| 212 | ( \ |
198 | ( \ |
|
| 213 | echo "$$$$CONTROL"; \ |
199 | echo "$$$$CONTROL"; \ |
|
| 214 | printf "Description: "; echo "$$$$DESCRIPTION" | sed -e 's,^[[:space:]]*, ,g'; \ |
200 | printf "Description: "; echo "$$$$DESCRIPTION" | sed -e 's,^[[:space:]]*, ,g'; \ |
|
| Line 247... | Line 233... | |||
| 247 | $(INSTALL_DIR) $$(PDIR_$(1)) |
233 | $(INSTALL_DIR) $$(PDIR_$(1)) |
|
| 248 | $(IPKG_BUILD) $$(IDIR_$(1)) $$(PDIR_$(1)) |
234 | $(IPKG_BUILD) $$(IDIR_$(1)) $$(PDIR_$(1)) |
|
| 249 | @[ -f $$(IPKG_$(1)) ] |
235 | @[ -f $$(IPKG_$(1)) ] |
|
| Line 250... | Line 236... | |||
| 250 | |
236 | |
|
| 251 | $(1)-clean: |
237 | $(1)-clean: |
|
| Line 252... | Line 238... | |||
| 252 | $$(if $$(call opkg_package_files,$(1)*),$$(IPKG_REMOVE) $(1) $$(call opkg_package_files,$(1)*)) |
238 | $$(if $$(call opkg_package_files,$(1)),rm -f $$(call opkg_package_files,$(1))) |
|
| Line 253... | Line 239... | |||
| 253 | |
239 | |
|
| 254 | clean: $(1)-clean |
240 | clean: $(1)-clean |
|