Skip to contentSkip to conversation

coreutils: correct the case for class-native

PATCH In review Dengke Du 3 participants 7 messages Apr 6, 2016 – Apr 21, 2016

lore
Share & tools
lore

Dengke Du

author
#0 lore raw

cover coreutils: correct the case for class-native

The following changes since commit f4f1d206f4ebafcde18c96c88a1bfc4ab7b0c119:

scripts/lib/bsp/help.py: Typo in help for yocto-bsp create (2016-04-05 14:33:58 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib dengke/correct_the_case_for_class-native
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=dengke/correct_the_case_for_class-native

Dengke Du (1):
coreutils: correct the case for class-native

 meta/recipes-core/coreutils/coreutils_8.25.bb | 4 ++++
 1 file changed, 4 insertions(+)
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/1 coreutils: correct the case for class-native

The function of do_install_append_class-native for class-native had alread exist,so exclude the class-native in function do_install_append.

---
 meta/recipes-core/coreutils/coreutils_8.25.bb | 4 ++++
 1 file changed, 4 insertions(+)
meta/recipes-core/coreutils/coreutils_8.25.bb +4 -0
index 419a693..e8e269a 100644
@@ -70,6 +70,10 @@ do_compile_prepend () {
 }
 
 do_install_append() {
+	if [ "${CLASSOVERRIDE}" = "class-native" ]; then
+		return
+	fi
+
 	for i in df mktemp base64; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${BPN}; done
 
 	install -d ${D}${base_bindir}
Signature · 1 line
1.9.1
#2 lore raw

Sorry, my email has some problem that it send twice. I will fix it as soon as.

//dengke

Quoted 24 lines · Dengke Du

The function of do_install_append_class-native for class-native had alread exist,so exclude the class-native in function do_install_append.

---
  meta/recipes-core/coreutils/coreutils_8.25.bb | 4 ++++
  1 file changed, 4 insertions(+)
meta/recipes-core/coreutils/coreutils_8.25.bb +4 -0
index 419a693..e8e269a 100644
@@ -70,6 +70,10 @@ do_compile_prepend () {
  }
 
  do_install_append() {
+	if [ "${CLASSOVERRIDE}" = "class-native" ]; then
+		return
+	fi
+
  	for i in df mktemp base64; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${BPN}; done
 
  	install -d ${D}${base_bindir}
#3 lore raw
In reply to Dengke Du
Quoted 14 lines · Dengke Du

The function of do_install_append_class-native for class-native had alread exist,so exclude the class-native in function do_install_append.

---
  meta/recipes-core/coreutils/coreutils_8.25.bb | 4 ++++
  1 file changed, 4 insertions(+)
meta/recipes-core/coreutils/coreutils_8.25.bb +0 -0
index 419a693..e8e269a 100644

meta/recipes-core/coreutils/coreutils_8.25.bb do_compile_prepend () { · line 76

Quoted 7 lines
meta/recipes-core/coreutils/coreutils_8.25.bb +4 -0
@@ -70,6 +70,10 @@ do_compile_prepend () {
  }
 
  do_install_append() {
+	if [ "${CLASSOVERRIDE}" = "class-native" ]; then
+		return
+	fi
+

We need this patch, otherwise the tools provided by coreutils-native are broken, for example, "ln" is "ln.coreutils" in native sysroot, which can't be used by default.

This patch can fix the problem.

// Robert

Quoted 4 lines
meta/recipes-core/coreutils/coreutils_8.25.bb +0 -0
  	for i in df mktemp base64; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${BPN}; done
 
  	install -d ${D}${base_bindir}
#4 lore raw
Quoted 20 lines · Robert Yang
Quoted 18 lines · Dengke Du

The function of do_install_append_class-native for class-native had alread exist,so exclude the class-native in function do_install_append.

---
  meta/recipes-core/coreutils/coreutils_8.25.bb | 4 ++++

  1 file changed, 4 insertions(+)
meta/recipes-core/coreutils/coreutils_8.25.bb +0 -0
index 419a693..e8e269a 100644
@@ -70,6 +70,10 @@ do_compile_prepend () {
   }
 
Quoted 5 lines

meta/recipes-core/coreutils/coreutils_8.25.bb do_compile_prepend () { · line 76

Quoted 5 lines
meta/recipes-core/coreutils/coreutils_8.25.bb +4 -0
   do_install_append() {
+	if [ "${CLASSOVERRIDE}" = "class-native" ]; then
+		return
+	fi
+

If the do_install_append is only valid for the target it'd be cleaner to use a target-specific override i.e.

do_install_append_class-target () {
}

Thanks,

Joshua

#5 lore raw
Quoted 21 lines · Joshua G Lock
Quoted 20 lines · Robert Yang
Quoted 18 lines · Dengke Du

The function of do_install_append_class-native for class-native had alread exist,so exclude the class-native in function do_install_append.

---
   meta/recipes-core/coreutils/coreutils_8.25.bb | 4 ++++
   1 file changed, 4 insertions(+)
meta/recipes-core/coreutils/coreutils_8.25.bb +0 -0
index 419a693..e8e269a 100644
@@ -70,6 +70,10 @@ do_compile_prepend () {
   }
 
Quoted 8 lines
Quoted 5 lines

meta/recipes-core/coreutils/coreutils_8.25.bb do_compile_prepend () { · line 76

Quoted 5 lines
meta/recipes-core/coreutils/coreutils_8.25.bb +4 -0
   do_install_append() {
+	if [ "${CLASSOVERRIDE}" = "class-native" ]; then
+		return
+	fi
+

If the do_install_append is only valid for the target it'd be cleaner to use a target-specific override i.e.

Thanks, but it is needed by both target and nativesdk.

// Robert

Quoted 8 lines

do_install_append_class-target () {
}

Thanks,

Joshua

#6 lore raw
In reply to Joshua G Lock

But the nativesdk also need the do_install_append function to slove the many warnings.

//dengke

Quoted 33 lines · Joshua G Lock
Quoted 18 lines · Robert Yang
Quoted 17 lines · Dengke Du

The function of do_install_append_class-native for class-native had alread exist,so exclude the class-native in function do_install_append.

---
   meta/recipes-core/coreutils/coreutils_8.25.bb | 4 ++++
   1 file changed, 4 insertions(+)
meta/recipes-core/coreutils/coreutils_8.25.bb +0 -0
index 419a693..e8e269a 100644
@@ -70,6 +70,10 @@ do_compile_prepend () {
   }
 
Quoted 5 lines

meta/recipes-core/coreutils/coreutils_8.25.bb do_compile_prepend () { · line 76

Quoted 5 lines
meta/recipes-core/coreutils/coreutils_8.25.bb +4 -0
   do_install_append() {
+	if [ "${CLASSOVERRIDE}" = "class-native" ]; then
+		return
+	fi
+

If the do_install_append is only valid for the target it'd be cleaner to use a target-specific override i.e.

do_install_append_class-target () {
}

Thanks,

Joshua