| Message ID | 20170704162211.13238-9-maxime.hadjinlian@gmail.com |
|---|---|
| State | Changes Requested |
| Headers | show |
On 04-07-17 18:22, Maxime Hadjinlian wrote: > With all the previous changes, we are now ready to add a subdirectory to > the DL_DIR. > The structure will now be DL_DIR/PKG_NAME/{FILE1,FILE2} > > This is needed for multiple reasons: > - Avoid patches with name like SHA1.patch laying flat in DL_DIR, names > which makes it hard to know to which packages they apply > - Avoid possible collisions if two releases have the same name > (e.g: v01.tar) > - Allow the possibility to handle a git cache per package in the > newly created subdirectory. > > Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> > --- > package/pkg-generic.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > index 5d169b20d6..7364551471 100644 > --- a/package/pkg-generic.mk > +++ b/package/pkg-generic.mk > @@ -434,7 +434,7 @@ endif > > $(2)_BASE_NAME = $$(if $$($(2)_VERSION),$(1)-$$($(2)_VERSION),$(1)) > $(2)_RAW_BASE_NAME = $$(if $$($(2)_VERSION),$$($(2)_RAWNAME)-$$($(2)_VERSION),$$($(2)_RAWNAME)) > -$(2)_DL_DIR = $$(DL_DIR) > +$(2)_DL_DIR = $$(DL_DIR)/$$($(2)_RAWNAME) > $(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASE_NAME) > > ifndef $(2)_SUBDIR >
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 5d169b20d6..7364551471 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -434,7 +434,7 @@ endif $(2)_BASE_NAME = $$(if $$($(2)_VERSION),$(1)-$$($(2)_VERSION),$(1)) $(2)_RAW_BASE_NAME = $$(if $$($(2)_VERSION),$$($(2)_RAWNAME)-$$($(2)_VERSION),$$($(2)_RAWNAME)) -$(2)_DL_DIR = $$(DL_DIR) +$(2)_DL_DIR = $$(DL_DIR)/$$($(2)_RAWNAME) $(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASE_NAME) ifndef $(2)_SUBDIR
With all the previous changes, we are now ready to add a subdirectory to the DL_DIR. The structure will now be DL_DIR/PKG_NAME/{FILE1,FILE2} This is needed for multiple reasons: - Avoid patches with name like SHA1.patch laying flat in DL_DIR, which makes it hard to know to which packages they apply - Avoid possible collisions if two releases have the same name (e.g: v01.tar) - Allow the possibility to handle a git cache per package in the newly created subdirectory. Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> --- package/pkg-generic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)