Skip to contentSkip to conversation

sam-ba: use correct host arch binary for sam-ba symlink

PATCH New Joshua Henderson 2 participants 4 messages Mar 22, 2018 – Mar 26, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sam-ba: use correct host arch binary for sam-ba symlink

Make the symlink created in the host/bin directory point to the right host arch binary. This takes into account using the 32 bit or 64 bit binary.

---
 package/sam-ba/sam-ba.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/sam-ba/sam-ba.mk +7 -1
index 244ede3..3ad98e0 100644
@@ -23,10 +23,16 @@ endef
 # then create a symbolic link from $(HOST_DIR)/bin to the
 # application binary, for easier usage.
 
+ifeq ($(HOSTARCH),x86_64)
+SAM_BA_BIN_NAME=sam-ba_64
+else
+SAM_BA_BIN_NAME=sam-ba
+endif
+
 define HOST_SAM_BA_INSTALL_CMDS
 	mkdir -p $(HOST_DIR)/opt/sam-ba/
 	cp -a $(@D)/* $(HOST_DIR)/opt/sam-ba/
-	ln -sf ../../opt/sam-ba/sam-ba $(HOST_DIR)/bin/sam-ba
+	ln -sf ../opt/sam-ba/$(SAM_BA_BIN_NAME) $(HOST_DIR)/bin/sam-ba
 endef
 
 $(eval $(host-generic-package))
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 sam-ba: use correct host arch binary for sam-ba symlink

Hello Joshua,

Quoted 7 lines · Joshua Henderson

Make the symlink created in the host/bin directory point to the right host arch binary. This takes into account using the 32 bit or 64 bit binary.

---
 package/sam-ba/sam-ba.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

In fact, your commit does much more than fixing the sam-ba symlink depending on the host architecture: the sam-ba symlink was *always* broken. Indeed, you're changing this:

- ln -sf ../../opt/sam-ba/sam-ba $(HOST_DIR)/bin/sam-ba
+ ln -sf ../opt/sam-ba/$(SAM_BA_BIN_NAME) $(HOST_DIR)/bin/sam-ba

I.e you're removing one level of ../ when creating the relative symlink. And this is needed since we moved $(HOST_DIR)/usr to $(HOST_DIR).

So even on a x86 32 bit system, where the binary is named "sam-ba", your commit fixes the symbolic link. I've reworded the commit log accordingly, and applied your patch. Thanks!

Peter: this commit qualifies for 2018.02.x.

Joshua: what about updating to 2.17, or even Sam-ba 3.x ?

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 sam-ba: use correct host arch binary for sam-ba symlink

Thomas, Alexandre,

Quoted 18 lines · Thomas Petazzoni

Hello Joshua,

Quoted 7 lines · Joshua Henderson

Make the symlink created in the host/bin directory point to the right host arch binary. This takes into account using the 32 bit or 64 bit binary.

---
 package/sam-ba/sam-ba.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

In fact, your commit does much more than fixing the sam-ba symlink depending on the host architecture: the sam-ba symlink was *always* broken. Indeed, you're changing this:

package/sam-ba/sam-ba.mk +1 -1
-	ln -sf ../../opt/sam-ba/sam-ba $(HOST_DIR)/bin/sam-ba
+	ln -sf ../opt/sam-ba/$(SAM_BA_BIN_NAME) $(HOST_DIR)/bin/sam-ba
Quoted 7 lines

I.e you're removing one level of ../ when creating the relative symlink. And this is needed since we moved $(HOST_DIR)/usr to $(HOST_DIR).

So even on a x86 32 bit system, where the binary is named "sam-ba", your commit fixes the symbolic link. I've reworded the commit log accordingly, and applied your patch. Thanks!

That is correct. Thank you for clarifying.

Quoted 4 lines

Peter: this commit qualifies for 2018.02.x.

Joshua: what about updating to 2.17, or even Sam-ba 3.x ?

I have something in this direction in progress. I just have to finish up reconciling the update to sam-ba 3.x with things like board/atmel/flasher.sh. I'm not sure what that means yet. Should flasher.sh stick around?

Josh

#3 lore raw

PATCH 1/1 sam-ba: use correct host arch binary for sam-ba symlink

Hello,

Quoted 4 lines · Joshua Henderson

I have something in this direction in progress. I just have to finish up reconciling the update to sam-ba 3.x with things like board/atmel/flasher.sh. I'm not sure what that means yet. Should flasher.sh stick around?

It doesn't have to, as long as there is some reasonable details in board/atmel/readme.txt that explains who to flash the boards.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com