Skip to contentSkip to conversation

sunxi-tools: bump version, add hash

PATCH New Peter Korsgaard 2 participants 2 messages Nov 23, 2015 – Nov 25, 2015 Arm/Allwinner sunXi SoC support

lore
Share & tools
lore

Peter Korsgaard

author
#0 lore raw

PATCH 1/1 sunxi-tools: bump version, add hash

Upstream has reworked its build system, so it now supports PREFIX and 'make install', so use those.

Notice that the tools have also gained a sunxi- prefix, so use that as well when installing the target variant.

Signed-off-by Peter Korsgaard <[email protected]>
---
 package/sunxi-tools/sunxi-tools.hash |  2 ++
 package/sunxi-tools/sunxi-tools.mk   | 17 ++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 package/sunxi-tools/sunxi-tools.hash
package/sunxi-tools/sunxi-tools.hash new file +2 -0
new file mode 100644
index 0000000..c0499cd
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256	2aa0afc21476ee9b03acff20a19f32c522106e61bcbfa1a9463168fe90a85fc5  sunxi-tools-v1.3.tar.gz
package/sunxi-tools/sunxi-tools.mk +8 -9
index 049af9b..4c497c7 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SUNXI_TOOLS_VERSION = 82b9c656868d99553f11b1c8853ca808c7ce41ae
+SUNXI_TOOLS_VERSION = v1.3
 SUNXI_TOOLS_SITE = $(call github,linux-sunxi,sunxi-tools,$(SUNXI_TOOLS_VERSION))
 SUNXI_TOOLS_LICENSE = GPLv2+
 SUNXI_TOOLS_LICENSE_FILES = COPYING

@@ -12,25 +12,24 @@ HOST_SUNXI_TOOLS_DEPENDENCIES = host-libusb host-pkgconf
 FEX2BIN = $(HOST_DIR)/usr/bin/fex2bin
 
 define HOST_SUNXI_TOOLS_BUILD_CMDS
-	$(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \
+	$(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) PREFIX=$(HOST_DIR)/usr \
 		CFLAGS="$(HOST_CFLAGS) -std=c99 -D_POSIX_C_SOURCE=200112L -Iinclude/" \
-		-C $(@D)
+		-C $(@D) tools
 endef
 
 define HOST_SUNXI_TOOLS_INSTALL_CMDS
-	for i in fexc bin2fex fex2bin bootinfo fel pio; do \
-		$(INSTALL) -D -m 0755 $(@D)/$$i $(HOST_DIR)/usr/bin/$$i ; \
-	done
+	$(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) PREFIX=$(HOST_DIR)/usr \
+		-C $(@D) install-tools
 endef
 
 define SUNXI_TOOLS_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
+	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) PREFIX=/usr \
 		CFLAGS="$(TARGET_CFLAGS) -std=c99 -D_POSIX_C_SOURCE=200112L -Iinclude/" \
-		-C $(@D) nand-part
+		-C $(@D) sunxi-nand-part
 endef
 
 define SUNXI_TOOLS_INSTALL_TARGET_CMDS
-	$(INSTALL) -D -m 0755 $(@D)/nand-part $(TARGET_DIR)/usr/bin/nand-part
+	$(INSTALL) -D -m 0755 $(@D)/sunxi-nand-part $(TARGET_DIR)/usr/bin/sunxi-nand-part
 endef
 
 $(eval $(generic-package))
Signature · 1 line
2.1.4
Applied
#1 lore raw

PATCH 1/1 sunxi-tools: bump version, add hash

Dear Peter Korsgaard,

Quoted 6 lines · Peter Korsgaard

Upstream has reworked its build system, so it now supports PREFIX and 'make install', so use those.

Notice that the tools have also gained a sunxi- prefix, so use that as well when installing the target variant.

Quoted 6 lines
Signed-off-by Peter Korsgaard <[email protected]>
---
 package/sunxi-tools/sunxi-tools.hash |  2 ++
 package/sunxi-tools/sunxi-tools.mk   | 17 ++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 package/sunxi-tools/sunxi-tools.hash

Applied to next, thanks.

Thomas

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