Message ID | CANqewP2HZviH=vUGPu4JDrOKgpTjXx9BuVbO23PiM5u27+t5OA@mail.gmail.com |
---|---|
State | Not Applicable |
Headers | show |
Hello,
On Sat, 17 Sep 2016 07:36:54 +0000, Tatsuyuki Ishi wrote:
> Thank you, the following is the updated patch.
Thanks. But this patch also cannot be applied, for two reasons:
- The changelog part of the message such as "Thank you, the
following..." should not be part of the commit log, but instead
should be below the "---" so that it does not get integrated in the
Git history when the patch is applied.
- Since you haven't used git send-email, your patch is line-wrapped
(i.e long lines are wrapped), so it cannot be applied.
Could you rework your patch to take into account those comments?
Thanks!
Thomas
diff --git a/package/php/php.hash b/package/php/php.hash index 6e146f8..0092095 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,2 +1,2 @@ # From http://php.net/downloads.php -sha256 970c322ba3e472cb0264b8ba9d4d92e87918da5d0cca53c4aba2a70545b8626d php-7.0.9.tar.xz +sha256 d4cccea8da1d27c11b89386f8b8e95692ad3356610d571253d00ca67d524c735 php-7.0.11.tar.xz diff --git a/package/php/php.mk b/package/php/php.mk index 7df10be..083b451 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ########################################################### ##################### -PHP_VERSION = 7.0.9 +PHP_VERSION = 7.0.11 PHP_SITE = http://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz
Thank you, the following is the updated patch. From: Tatsuyuki Ishi <ishitatsuyuki@gmail.com> --- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) PHP_INSTALL_STAGING = YES -- 2.9.3