| Message ID | 20170524143218.1020-3-julian@labus-online.de |
|---|---|
| State | Accepted |
| Headers | show |
Hello Julian, On 24.05.2017 16:32, Julian Labus wrote: > add support for new hardware Thanks for taking care of this. If you want to keep usb-modeswitch-data version bump in a separate commit, I suppose that the PKG_RELEASE should be increased, according to the "Packaging guidelines" [1]. Or, maybe it make sense to squash both versions update commits. [1] https://forum.lede-project.org/t/packaging-guidelines/65/2 -- Cheers, Piotr > > Signed-off-by: Julian Labus <julian@labus-online.de> > --- > package/utils/usbmode/Makefile | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/utils/usbmode/Makefile b/package/utils/usbmode/Makefile > index a5c9b19ddf..7f0195fdce 100644 > --- a/package/utils/usbmode/Makefile > +++ b/package/utils/usbmode/Makefile > @@ -15,7 +15,7 @@ PKG_LICENSE_FILES:= > > PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> > > -PKG_DATA_VERSION:=20150115 > +PKG_DATA_VERSION:=20170205 > PKG_DATA_URL:=http://www.draisberghof.de/usb_modeswitch > PKG_DATA_PATH:=usb-modeswitch-data-$(PKG_DATA_VERSION) > PKG_DATA_FILENAME:=$(PKG_DATA_PATH).tar.bz2 > @@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/cmake.mk > define Download/data > FILE:=$(PKG_DATA_FILENAME) > URL:=$(PKG_DATA_URL) > - HASH:=90549f589835a68279369c3dc0d47eb7338ee3bad09d737e7b85e1ab15bd2d8b > + HASH:=e2dcfd9d28928d8d8f03381571a23442b3c50d48d343bc40a1a07d01662738d1 > endef > $(eval $(call Download,data)) > >
Hi Piotr, I will resubmit the patch tomorrow in a squashed version. I don't see a reason to have a package version that will never be used. My thought on this was that it maybe easier to merge because you already had a similar patch in your staging tree. But as you already unstaged it this isn't a problem. Regards, Julian On 05/24/2017 05:14 PM, Piotr Dymacz wrote: > If you want to keep usb-modeswitch-data version bump in a separate commit, I suppose that the PKG_RELEASE should be increased, according to the "Packaging guidelines" [1]. > > Or, maybe it make sense to squash both versions update commits. > > [1] https://forum.lede-project.org/t/packaging-guidelines/65/2
On 2017-05-24 17:14, Piotr Dymacz wrote: > Hello Julian, > > On 24.05.2017 16:32, Julian Labus wrote: >> add support for new hardware > > Thanks for taking care of this. > > If you want to keep usb-modeswitch-data version bump in a separate > commit, I suppose that the PKG_RELEASE should be increased, according to > the "Packaging guidelines" [1]. > > Or, maybe it make sense to squash both versions update commits. > > [1] https://forum.lede-project.org/t/packaging-guidelines/65/2 I think a PKG_RELEASE bump makes no sense here, neither does squashing the commits together. Since the commits are going to be pushed at the same time, there will not be a snapshot build inbetween... - Felix
Hi Felix, On 24.05.2017 17:54, Felix Fietkau wrote: > On 2017-05-24 17:14, Piotr Dymacz wrote: >> Hello Julian, >> >> On 24.05.2017 16:32, Julian Labus wrote: >>> add support for new hardware >> >> Thanks for taking care of this. >> >> If you want to keep usb-modeswitch-data version bump in a separate >> commit, I suppose that the PKG_RELEASE should be increased, according to >> the "Packaging guidelines" [1]. >> >> Or, maybe it make sense to squash both versions update commits. >> >> [1] https://forum.lede-project.org/t/packaging-guidelines/65/2 > I think a PKG_RELEASE bump makes no sense here, neither does squashing > the commits together. OK, PKG_RELEASE value maintaining was always confusing for me. -- Cheers, Piotr > Since the commits are going to be pushed at the same time, there will > not be a snapshot build inbetween... > > - Felix >
diff --git a/package/utils/usbmode/Makefile b/package/utils/usbmode/Makefile index a5c9b19ddf..7f0195fdce 100644 --- a/package/utils/usbmode/Makefile +++ b/package/utils/usbmode/Makefile @@ -15,7 +15,7 @@ PKG_LICENSE_FILES:= PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> -PKG_DATA_VERSION:=20150115 +PKG_DATA_VERSION:=20170205 PKG_DATA_URL:=http://www.draisberghof.de/usb_modeswitch PKG_DATA_PATH:=usb-modeswitch-data-$(PKG_DATA_VERSION) PKG_DATA_FILENAME:=$(PKG_DATA_PATH).tar.bz2 @@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/cmake.mk define Download/data FILE:=$(PKG_DATA_FILENAME) URL:=$(PKG_DATA_URL) - HASH:=90549f589835a68279369c3dc0d47eb7338ee3bad09d737e7b85e1ab15bd2d8b + HASH:=e2dcfd9d28928d8d8f03381571a23442b3c50d48d343bc40a1a07d01662738d1 endef $(eval $(call Download,data))
add support for new hardware Signed-off-by: Julian Labus <julian@labus-online.de> --- package/utils/usbmode/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)