Skip to contentSkip to conversation

base-files: sed installed file instead of original

PATCH New Saul Wold 1 participant 3 messages Feb 26, 2014

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

PATCH 1/3 base-files: sed installed file instead of original

When we change the ROOT_HOME the sed regex does not match if we are running the do_install() a second time, so sed the installed file and preserve the original so that the sed regex is matched correctly in the original

[YOCTO #5765]

---
 meta/recipes-core/base-files/base-files_3.0.14.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/base-files/base-files_3.0.14.bb +1 -1
index 726e0d5..dbf40fa 100644
@@ -90,8 +90,8 @@ do_install () {
 	install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}/fstab
 	install -m 0644 ${WORKDIR}/filesystems ${D}${sysconfdir}/filesystems
 	install -m 0644 ${WORKDIR}/usbd ${D}${sysconfdir}/default/usbd
-	sed -i "s#ROOTHOME#${ROOT_HOME}#" ${WORKDIR}/profile
 	install -m 0644 ${WORKDIR}/profile ${D}${sysconfdir}/profile
+	sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}${sysconfdir}/profile
 	install -m 0644 ${WORKDIR}/shells ${D}${sysconfdir}/shells
 	install -m 0755 ${WORKDIR}/share/dot.profile ${D}${sysconfdir}/skel/.profile
 	install -m 0755 ${WORKDIR}/share/dot.bashrc ${D}${sysconfdir}/skel/.bashrc
Signature · 1 line
1.8.3.1
author
#1 lore raw

PATCH 2/3 base-passwd: sed installed file instead of original

When we change the ROOT_HOME the sed regex does not match if we are running the do_install() a second time, so sed the installed file and preserve the original so that the sed regex is matched correctly in the original

[YOCTO #5765]

---
 meta/recipes-core/base-passwd/base-passwd_3.5.29.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/base-passwd/base-passwd_3.5.29.bb +1 -1
index 0205f2e..59bd413 100644
@@ -28,8 +28,8 @@ do_install () {
 		${D}${mandir}/pl/man8/update-passwd.8
 	gzip -9 ${D}${mandir}/man8/* ${D}${mandir}/pl/man8/*
 	install -d -m 755 ${D}${datadir}/base-passwd
-	sed -i 's#:/root:#:${ROOT_HOME}:#' ${S}/passwd.master
 	install -o root -g root -p -m 644 ${S}/passwd.master ${D}${datadir}/base-passwd/
+	sed -i 's#:/root:#:${ROOT_HOME}:#' ${D}${datadir}/base-passwd/passwd.master
 	install -o root -g root -p -m 644 ${S}/group.master ${D}${datadir}/base-passwd/
 
 	install -d -m 755 ${D}${docdir}/${BPN}
Signature · 1 line
1.8.3.1
author
#2 lore raw

PATCH 3/3 systemd: sed installed file instead of original

In reply to Saul Wold

When we change the ROOT_HOME the sed regex does not match if we are running the do_install() a second time, so copy the units files first to a pre_sed, so that the next time, we can copy the the original so that the sed regex is matched correctly in the original

[YOCTO #5765]

---
 meta/recipes-core/systemd/systemd_208.bb | 5 +++++
 1 file changed, 5 insertions(+)
meta/recipes-core/systemd/systemd_208.bb +5 -0
index 219607f..1bcedaa 100644
@@ -89,6 +89,11 @@ EXTRA_OECONF_append_libc-uclibc = " --disable-myhostname "
 do_configure_prepend() {
 	export CPP="${HOST_PREFIX}cpp ${TOOLCHAIN_OPTIONS} ${HOST_CC_ARCH}"
 	export KMOD="${base_bindir}/kmod"
+	if [ -d ${S}/units.pre_sed ] ; then
+		cp -r ${S}/units.pre_sed ${S}/units
+	else
+		cp -r ${S}/units ${S}/units.pre_sed
+	fi
 	sed -i -e 's:=/root:=${ROOT_HOME}:g' ${S}/units/*.service*
 }
 
Signature · 1 line
1.8.3.1