Skip to contentSkip to conversation

bootstrap: bump version to 4.0.0

PATCH New Adam Duskett 2 participants 3 messages Jan 24, 2018 – Jan 30, 2018

lore
Share & tools
lore

Adam Duskett

author
#0 lore raw

PATCH 1/2 bootstrap: bump version to 4.0.0

other changes:
- Add a license file to bootstrap.mk
- Add a hash for the license file to bootstrap.hash
- Remove copying bootstrap-theme.min.css as it's no longer included.
- Remove copying fonts folder as it's no longer included.

Signed-off-by Adam Duskett <[email protected]>
---
 package/bootstrap/bootstrap.hash | 3 ++-
 package/bootstrap/bootstrap.mk   | 8 ++------
 2 files changed, 4 insertions(+), 7 deletions(-)
package/bootstrap/bootstrap.hash +2 -1
index abc09da213..6bf6e5218c 100644
@@ -1,2 +1,3 @@
 # Locally computed:
-sha256 f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b  bootstrap-3.3.7-dist.zip
+sha256	fa1caaaf640c32c553d0b323da1036f2232703d64a1d22c3a2ec84ace68c791a	bootstrap-4.0.0-dist.zip
+sha256	8c1a4c25634d5841924aab1848acc9dcbc3d5672183053c8b71ff2139b65d7c3	bootstrap.css
package/bootstrap/bootstrap.mk +2 -6
index 33161f53ae..aac457c190 100644
@@ -4,25 +4,21 @@
 #
 ################################################################################
 
-BOOTSTRAP_VERSION = 3.3.7
+BOOTSTRAP_VERSION = 4.0.0
 BOOTSTRAP_SITE = https://github.com/twbs/bootstrap/releases/download/v$(BOOTSTRAP_VERSION)
 BOOTSTRAP_SOURCE = bootstrap-$(BOOTSTRAP_VERSION)-dist.zip
 BOOTSTRAP_LICENSE = MIT
+BOOTSTRAP_LICENSE_FILES = bootstrap.css
 
 define BOOTSTRAP_EXTRACT_CMDS
 	$(UNZIP) $(DL_DIR)/$(BOOTSTRAP_SOURCE) -d $(@D)
-	mv $(@D)/bootstrap-$(BOOTSTRAP_VERSION)-dist/* $(@D)/
-	rmdir $(@D)/bootstrap-$(BOOTSTRAP_VERSION)-dist
 endef
 
 define BOOTSTRAP_INSTALL_TARGET_CMDS
-	$(INSTALL) -m 0644 -D $(@D)/css/bootstrap-theme.min.css \
-		$(TARGET_DIR)/var/www/bootstrap/css/bootstrap-theme.min.css
 	$(INSTALL) -m 0644 -D $(@D)/css/bootstrap.min.css \
 		$(TARGET_DIR)/var/www/bootstrap/css/bootstrap.min.css
 	$(INSTALL) -m 0644 -D $(@D)/js/bootstrap.min.js \
 		$(TARGET_DIR)/var/www/bootstrap/js/bootstrap.min.js
-	cp -r $(@D)/fonts $(TARGET_DIR)/var/www/bootstrap/
 endef
 
 $(eval $(generic-package))
Signature · 1 line
2.14.3
author
#1 lore raw

PATCH 2/2 angularjs: bump version to 1.6.7

Also add a hash for the license file.

Signed-off-by Adam Duskett <[email protected]>
---
 package/angularjs/angularjs.hash | 3 ++-
 package/angularjs/angularjs.mk   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
package/angularjs/angularjs.hash +2 -1
index 100b6dc667..918c049c73 100644
@@ -1,2 +1,3 @@
 # Locally computed:
-sha256 a99e3c22b54178b7646856efd95e825650d32d3125904a28216aeba52e221bad angular-1.4.3.zip
+sha256	4d4e87d24c7d522f4ee765e4f7d454b9cf2a0f6407248545528064e66ad7b085	angular-1.6.7.zip
+sha256	cec36623ceba33c503784164917c206047079159bf88f51a695a4dfb9d9b7ede	angular.js
package/angularjs/angularjs.mk +1 -1
index 08a4b60845..60702a26d2 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ANGULARJS_VERSION = 1.4.3
+ANGULARJS_VERSION = 1.6.7
 ANGULARJS_SOURCE = angular-$(ANGULARJS_VERSION).zip
 ANGULARJS_SITE = https://code.angularjs.org/$(ANGULARJS_VERSION)
 ANGULARJS_LICENSE = MIT
Signature · 1 line
2.14.3
#2 lore raw

PATCH 1/2 bootstrap: bump version to 4.0.0

In reply to Adam Duskett

Hello,

Quoted 11 lines · Adam Duskett

other changes:
- Add a license file to bootstrap.mk
- Add a hash for the license file to bootstrap.hash
- Remove copying bootstrap-theme.min.css as it's no longer included.
- Remove copying fonts folder as it's no longer included.

Signed-off-by Adam Duskett <[email protected]>
---
 package/bootstrap/bootstrap.hash | 3 ++-
 package/bootstrap/bootstrap.mk   | 8 ++------
 2 files changed, 4 insertions(+), 7 deletions(-)

Both applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com