Right; I actually fixed it as part of PATCH 3/4. I will post an updated set which will remove it from this patch and post it separately.
-----Original Message----- From: openwrt-devel [mailto:openwrt-devel-boun...@lists.openwrt.org] On Behalf Of Karl P Sent: Thursday, April 17, 2014 1:21 PM To: openwrt-devel@lists.openwrt.org Subject: Re: [OpenWrt-Devel] [PATCH 1/4] include: Restore package-version-override.mk Seconded, I was hoping to send a patch restoring this as well. One point though, you should include the fix in: https://lists.openwrt.org/pipermail/openwrt-devel/2014-April/024605.html I'm open to alternative suggestions of workflow to not need this, but when I'm working on application code, I find this much more convenient that having to go and directly modify the package makefile each time, particularly if I don't actually need to be modifying the package makefile as well. Sincerely, Karl Palsson On 04/17/2014 07:12 PM, Mathieu Olivari wrote: > This feature is actually quite useful. Obviously it's an opt-in > approach from a package standpoint, but it's pretty useful to swap > package versions as well as pulling components TOT. In that case, > working directly on the GIT tree by enabling that option is sometimes > seen as a more flexible way than having to modify the Makefile to > point to the git tree location. > > This restores this file to the version that was removed in: > 09bf079: lantiq: remove unmaintained code > > Signed-off-by: Mathieu Olivari <math...@qca.qualcomm.com> > --- > include/package-version-override.mk | 70 > +++++++++++++++++++++++++++++++++++ > 1 file changed, 70 insertions(+) > create mode 100644 include/package-version-override.mk > > diff --git a/include/package-version-override.mk > b/include/package-version-override.mk > new file mode 100644 > index 0000000..2c1741e > --- /dev/null > +++ b/include/package-version-override.mk > @@ -0,0 +1,70 @@ > +# remember the provided package version > +PKG_VERSION_ORGINAL:=$(PKG_VERSION) > + > +# in case that another version is provided, overwrite the original > +ifeq ($(CONFIG_$(PKG_NAME)_USE_CUSTOM_VERSION),y) > +PKG_VERSION:=$(call qstrip,$(CONFIG_$(PKG_NAME)_CUSTOM_VERSION)) > +PKG_SOURCE:=$(subst > +$(PKG_VERSION_ORGINAL),$(PKG_VERSION),$(PKG_SOURCE)) > +PKG_MD5SUM:= > +endif > + > +# package specific configuration > +# if includeded the package version can be overwritten within the > +.config file (instead of changing the package specific Makefile) define > Package/$(PKG_NAME)/override_version > + menu "overwrite package version" > + depends on PACKAGE_$(PKG_NAME) > + config $(PKG_NAME)_USE_CUSTOM_VERSION > + depends on PACKAGE_$(PKG_NAME) > + bool "Use custom package version" > + default n > + config $(PKG_NAME)_CUSTOM_VERSION > + depends on $(PKG_NAME)_USE_CUSTOM_VERSION > + string "$(PKG_BASE_NAME) version as string (default version: > $(PKG_VERSION_ORGINAL))" > + default "$(PKG_VERSION_ORGINAL)" > + endmenu > +endef > + > +# in case that an customer source path is provided, set the acc. > +default variable ifeq ($(CONFIG_$(PKG_NAME)_USE_CUSTOM_SOURCE_DIR),y) > +PKG_DEFAULT_CUSTOM_SOURCE_DIR:= $(call > +qstrip,$(CONFIG_$(PKG_NAME)_CUSTOM_SOURCE_DIR)) > +endif > + > +# package specific configuration > +# if includeded the package source path can be overwritten within the > +.config file (instead of changing the package specific Makefile) # > +instead of using a source ball (eg tar.gz) the specified path will point to > the location of the sources define Package/$(PKG_NAME)/override_source_path > + menu "custom source directory" > + depends on PACKAGE_$(PKG_NAME) > + config $(PKG_NAME)_USE_CUSTOM_SOURCE_DIR > + depends on PACKAGE_$(PKG_NAME) > + bool "Use custom source directory" > + default n > + config $(PKG_NAME)_CUSTOM_SOURCE_DIR > + depends on $(PKG_NAME)_USE_CUSTOM_SOURCE_DIR > + string "Custom source directory" > + default "$(PKG_DEFAULT_CUSTOM_SOURCE_DIR)" > + endmenu > +endef > + > +# default: > +# include both configurations as long this file is included before > +package.mk # in case that you're defining your own onfiguration > +within the package Makefile just include the stuff by yourself define > Package/$(PKG_NAME)/config > + $(call Package/$(PKG_NAME)/override_version) > + $(call Package/$(PKG_NAME)/override_source_path) > +endef > + > +# hook for custom source path > +# in case that the specified path is valid a link to the > +PKG_SOURCE_DIR is created # otherwise the make is stopped define > +prepare_custom_source_directory > + if [ -d $(CONFIG_$(PKG_NAME)_CUSTOM_SOURCE_DIR) ]; then \ > + rm -Rf $(PKG_BUILD_DIR); \ > + echo "Preparing Custom Source Directory link: > $(CONFIG_$(PKG_NAME)_CUSTOM_SOURCE_DIR)"; \ > + ln -snf $(CONFIG_$(PKG_NAME)_CUSTOM_SOURCE_DIR) > $(PKG_BUILD_DIR); \ > + else \ > + echo "Custom Source Directory > $(CONFIG_$(PKG_NAME)_CUSTOM_SOURCE_DIR) is invalid"; \ > + false; \ > + fi > +endef > + > _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
