Skip to contentSkip to conversation

Revert "kernel: restore scripts in the sysroot"

PATCH In review Richard Purdie 3 participants 3 messages Nov 27, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Revert "kernel: restore scripts in the sysroot"

This reverts commit 6a6735cb98d529c8c5376aedb5c951339f54fe96.

The module class already ensures the scripts are rebuilt correctly. Running this at sstate installation time is problematic since it can require the cross compiler. Adding such a dependency would cause issues of its own.

---

meta/classes/kernel.bbclass +0 -11
index 4974507..24ac778 100644
@@ -290,17 +290,6 @@ kernel_do_install() {
 }
 do_install[prefuncs] += "package_get_auto_pr"
 
-
-SSTATEPOSTINSTFUNCS += "kernelscripts_sstate_postinst"
-kernelscripts_sstate_postinst () {
-	if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]; then
-		( 
-		  cd ${STAGING_KERNEL_DIR}
-		  oe_runmake scripts
-		)
-	fi
-}
-
 python sysroot_stage_all () {
     oe.path.copyhardlinktree(d.expand("${D}${KERNEL_SRC_PATH}"), d.expand("${SYSROOT_DESTDIR}${KERNEL_SRC_PATH}"))
 }
Acked-by on v1 1/1
#1 lore raw
Quoted 5 lines · Richard Purdie

This reverts commit 6a6735cb98d529c8c5376aedb5c951339f54fe96.

The module class already ensures the scripts are rebuilt correctly. Running this at sstate installation time is problematic since it can require the cross compiler. Adding such a dependency would cause issues of its own.

I was waiting for the dust to clear and have been running with the same thing here, saves me from sending it and I've removed it from my queue.

Quoted 27 lines

---

meta/classes/kernel.bbclass +0 -11
index 4974507..24ac778 100644
@@ -290,17 +290,6 @@ kernel_do_install() {
  }
  do_install[prefuncs] += "package_get_auto_pr"
 
-
-SSTATEPOSTINSTFUNCS += "kernelscripts_sstate_postinst"
-kernelscripts_sstate_postinst () {
-	if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]; then
-		(
-		  cd ${STAGING_KERNEL_DIR}
-		  oe_runmake scripts
-		)
-	fi
-}
-
  python sysroot_stage_all () {
      oe.path.copyhardlinktree(d.expand("${D}${KERNEL_SRC_PATH}"), d.expand("${SYSROOT_DESTDIR}${KERNEL_SRC_PATH}"))
  }
#2 lore raw
Quoted 10 lines · Bruce Ashfield
Quoted 7 lines · Richard Purdie

This reverts commit 6a6735cb98d529c8c5376aedb5c951339f54fe96.

The module class already ensures the scripts are rebuilt correctly. Running
this at sstate installation time is problematic since it can require the cross compiler. Adding such a dependency would cause issues of its own.

Quoted 7 lines

I was waiting for the dust to clear and have been running with the same thing here, saves me from sending it and I've removed it from my queue.

Looks ok to me

Quoted 31 lines
Quoted 30 lines

---

meta/classes/kernel.bbclass +0 -4
index 4974507..24ac778 100644
@@ -290,17 +290,6 @@ kernel_do_install() {
  }
  do_install[prefuncs] += "package_get_auto_pr"
 
-
-SSTATEPOSTINSTFUNCS += "kernelscripts_sstate_postinst"
-kernelscripts_sstate_postinst () {
-       if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o

"${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]; then

meta/classes/kernel.bbclass +0 -7
-               (
-                 cd ${STAGING_KERNEL_DIR}
-                 oe_runmake scripts
-               )
-       fi
-}
-
  python sysroot_stage_all () {
      oe.path.copyhardlinktree(d.expand("${D}${KERNEL_SRC_PATH}"),

d.expand("${SYSROOT_DESTDIR}${KERNEL_SRC_PATH}"))
}