* [Buildroot] [PATCH/next] package/bootstrap: bump version to 3.3.7
@ 2017-05-21 18:10 Bernd Kuhls
2017-05-22 14:14 ` Thomas Petazzoni
0 siblings, 1 reply; 3+ messages in thread
From: Bernd Kuhls @ 2017-05-21 18:10 UTC (permalink / raw)
To: buildroot
Changed _INSTALL_TARGET_CMDS to reflect updated internal zip structure:
$ unzip -l ../dl/bootstrap-3.3.1-dist.zip
Archive: ../dl/bootstrap-3.3.1-dist.zip
Length Date Time Name
--------- ---------- ----- ----
0 2014-11-12 18:03 dist/
0 2014-11-12 18:03 dist/css/
[...]
$ unzip -l ../dl/bootstrap-3.3.7-dist.zip
Archive: ../dl/bootstrap-3.3.7-dist.zip
Length Date Time Name
--------- ---------- ----- ----
0 2016-07-25 15:53 bootstrap-3.3.7-dist/css/
[...]
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/bootstrap/bootstrap.hash | 2 +-
package/bootstrap/bootstrap.mk | 13 +++++++------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/package/bootstrap/bootstrap.hash b/package/bootstrap/bootstrap.hash
index acb06b424..abc09da21 100644
--- a/package/bootstrap/bootstrap.hash
+++ b/package/bootstrap/bootstrap.hash
@@ -1,2 +1,2 @@
# Locally computed:
-sha256 95ca4a02aff37570660c81a87065b53ebc281c33fa86b91a6a7a650eee10678f bootstrap-3.3.1-dist.zip
+sha256 f498a8ff2dd007e29c2074f5e4b01a9a01775c3ff3aeaf6906ea503bc5791b7b bootstrap-3.3.7-dist.zip
diff --git a/package/bootstrap/bootstrap.mk b/package/bootstrap/bootstrap.mk
index 17752ce06..2e0b884b5 100644
--- a/package/bootstrap/bootstrap.mk
+++ b/package/bootstrap/bootstrap.mk
@@ -4,9 +4,10 @@
#
################################################################################
-BOOTSTRAP_VERSION = 3.3.1
+BOOTSTRAP_VERSION = 3.3.7
BOOTSTRAP_SITE = https://github.com/twbs/bootstrap/releases/download/v$(BOOTSTRAP_VERSION)
-BOOTSTRAP_SOURCE = bootstrap-$(BOOTSTRAP_VERSION)-dist.zip
+BOOTSTRAP_SOURCE_DIR = bootstrap-$(BOOTSTRAP_VERSION)-dist
+BOOTSTRAP_SOURCE = $(BOOTSTRAP_SOURCE_DIR).zip
BOOTSTRAP_LICENSE = MIT
define BOOTSTRAP_EXTRACT_CMDS
@@ -14,13 +15,13 @@ define BOOTSTRAP_EXTRACT_CMDS
endef
define BOOTSTRAP_INSTALL_TARGET_CMDS
- $(INSTALL) -m 0644 -D $(@D)/dist/css/bootstrap-theme.min.css \
+ $(INSTALL) -m 0644 -D $(@D)/$(BOOTSTRAP_SOURCE_DIR)/css/bootstrap-theme.min.css \
$(TARGET_DIR)/var/www/bootstrap/css/bootstrap-theme.min.css
- $(INSTALL) -m 0644 -D $(@D)/dist/css/bootstrap.min.css \
+ $(INSTALL) -m 0644 -D $(@D)/$(BOOTSTRAP_SOURCE_DIR)/css/bootstrap.min.css \
$(TARGET_DIR)/var/www/bootstrap/css/bootstrap.min.css
- $(INSTALL) -m 0644 -D $(@D)/dist/js/bootstrap.min.js \
+ $(INSTALL) -m 0644 -D $(@D)/$(BOOTSTRAP_SOURCE_DIR)/js/bootstrap.min.js \
$(TARGET_DIR)/var/www/bootstrap/js/bootstrap.min.js
- cp -r $(@D)/dist/fonts $(TARGET_DIR)/var/www/bootstrap/
+ cp -r $(@D)/$(BOOTSTRAP_SOURCE_DIR)/fonts $(TARGET_DIR)/var/www/bootstrap/
endef
$(eval $(generic-package))
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH/next] package/bootstrap: bump version to 3.3.7
2017-05-21 18:10 [Buildroot] [PATCH/next] package/bootstrap: bump version to 3.3.7 Bernd Kuhls
@ 2017-05-22 14:14 ` Thomas Petazzoni
2017-05-22 19:03 ` Bernd Kuhls
0 siblings, 1 reply; 3+ messages in thread
From: Thomas Petazzoni @ 2017-05-22 14:14 UTC (permalink / raw)
To: buildroot
Hello,
On Sun, 21 May 2017 20:10:24 +0200, Bernd Kuhls wrote:
> Changed _INSTALL_TARGET_CMDS to reflect updated internal zip structure:
>
> $ unzip -l ../dl/bootstrap-3.3.1-dist.zip
> Archive: ../dl/bootstrap-3.3.1-dist.zip
> Length Date Time Name
> --------- ---------- ----- ----
> 0 2014-11-12 18:03 dist/
> 0 2014-11-12 18:03 dist/css/
> [...]
>
> $ unzip -l ../dl/bootstrap-3.3.7-dist.zip
> Archive: ../dl/bootstrap-3.3.7-dist.zip
> Length Date Time Name
> --------- ---------- ----- ----
> 0 2016-07-25 15:53 bootstrap-3.3.7-dist/css/
> [...]
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Changing INSTALL_TARGET_CMDS is not the right way of handling. Instead,
the EXTRACT_CMDS should be changed to drop the useless sub-directory,
i.e to mimic what tar --strip-components=1 does.
Could you fix this up?
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH/next] package/bootstrap: bump version to 3.3.7
2017-05-22 14:14 ` Thomas Petazzoni
@ 2017-05-22 19:03 ` Bernd Kuhls
0 siblings, 0 replies; 3+ messages in thread
From: Bernd Kuhls @ 2017-05-22 19:03 UTC (permalink / raw)
To: buildroot
Am Mon, 22 May 2017 16:14:34 +0200 schrieb Thomas Petazzoni:
> Changing INSTALL_TARGET_CMDS is not the right way of handling. Instead,
> the EXTRACT_CMDS should be changed to drop the useless sub-directory,
> i.e to mimic what tar --strip-components=1 does.
Hi Thomas,
is there an equivalent of --strip-components=1 for unzip?
Apparently no, unless you use some ugly script commands to move files
around:
https://superuser.com/questions/518347/equivalent-to-tars-strip-
components-1-in-unzip
https://superuser.com/questions/443891/unzip-how-to-trim-top-directories
https://unix.stackexchange.com/questions/38162/how-can-i-force-unzip-zip-
not-to-create-a-subdirectory-when-i-extract-it
Regards, Bernd
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-05-22 19:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-21 18:10 [Buildroot] [PATCH/next] package/bootstrap: bump version to 3.3.7 Bernd Kuhls
2017-05-22 14:14 ` Thomas Petazzoni
2017-05-22 19:03 ` Bernd Kuhls
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox