@@ -7,7 +7,7 @@ SRC_URI:append:anaconda = " \
do_install:append:anaconda() {
if [ "${INSTALLER_SERIAL}" = "1" ]; then
install -d ${D}${sysconfdir}/profile.d
- install -m 644 ${WORKDIR}/serial-screen-anaconda.sh ${D}${sysconfdir}/profile.d/
+ install -m 644 ${UNPACKDIR}/serial-screen-anaconda.sh ${D}${sysconfdir}/profile.d/
sed -i -e 's,@ROOT_HOME@,${ROOT_HOME},g' ${D}${systemd_unitdir}/system/serial-getty@.service
fi
@@ -1,12 +1,12 @@
do_install:prepend:qemux86-64:anaconda () {
- if test -s ${WORKDIR}/xorg.conf; then
- sed -i 's/Modes *"640x480"/Modes "1024x768"/g' ${WORKDIR}/xorg.conf
+ if test -s ${S}/xorg.conf; then
+ sed -i 's/Modes *"640x480"/Modes "1024x768"/g' ${S}/xorg.conf
fi
}
do_install:prepend:qemux86:anaconda () {
- if test -s ${WORKDIR}/xorg.conf; then
- sed -i 's/Modes *"640x480"/Modes "1024x768"/g' ${WORKDIR}/xorg.conf
+ if test -s ${S}/xorg.conf; then
+ sed -i 's/Modes *"640x480"/Modes "1024x768"/g' ${S}/xorg.conf
fi
}
@@ -9,7 +9,8 @@ SRC_URI = "file://anaconda-init \
file://Xusername \
file://COPYING"
-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -35,7 +36,7 @@ CLEANBROKEN = "1"
do_install() {
install -d ${D}/${sbindir}
- install -m 0755 ${WORKDIR}/anaconda-init ${D}${sbindir}/anaconda-init
+ install -m 0755 ${S}/anaconda-init ${D}${sbindir}/anaconda-init
if [ -n "${EULA_DIR}" ]; then
sed -i "s#@EULA_DIR@#${EULA_DIR}#g" ${D}${sbindir}/anaconda-init
else
@@ -47,9 +48,9 @@ do_install() {
install -d ${D}/${sysconfdir}/init.d
ln -sf ${sbindir}/anaconda-init ${D}/${sysconfdir}/init.d/anaconda-init
install -d ${D}${systemd_unitdir}/system
- install -m 0644 ${WORKDIR}/anaconda-init.service \
- ${WORKDIR}/anaconda-init-screen@.service \
- ${WORKDIR}/anaconda-init.target \
+ install -m 0644 ${S}/anaconda-init.service \
+ ${S}/anaconda-init-screen@.service \
+ ${S}/anaconda-init.target \
${D}${systemd_unitdir}/system
@@ -93,12 +93,12 @@ do_configure:prepend() {
do_install:append() {
mkdir -p ${D}${datadir}/anaconda/post-scripts
- install -m 644 ${WORKDIR}/81-edit-sudoers.ks ${D}${datadir}/anaconda/post-scripts
- install -m 644 ${WORKDIR}/81-systemd-preset-all.ks ${D}${datadir}/anaconda/post-scripts
- install -m 644 ${WORKDIR}/81-add-env-file-for-sshd.ks ${D}${datadir}/anaconda/post-scripts
+ install -m 644 ${UNPACKDIR}/81-edit-sudoers.ks ${D}${datadir}/anaconda/post-scripts
+ install -m 644 ${UNPACKDIR}/81-systemd-preset-all.ks ${D}${datadir}/anaconda/post-scripts
+ install -m 644 ${UNPACKDIR}/81-add-env-file-for-sshd.ks ${D}${datadir}/anaconda/post-scripts
install -m 644 ${S}/widgets/src/resources/*.svg ${D}${datadir}/anaconda/pixmaps
install -m 644 ${S}/widgets/src/resources/*.png ${D}${datadir}/anaconda/pixmaps
- install -m 644 ${WORKDIR}/fedora.css ${D}${datadir}/anaconda/pixmaps
+ install -m 644 ${UNPACKDIR}/fedora.css ${D}${datadir}/anaconda/pixmaps
}
python __anonymous () {
@@ -7,9 +7,9 @@ SRC_URI:append:anaconda = " \
"
do_install:append:anaconda() {
- install -m 0755 ${WORKDIR}/union-fs ${D}/init.d/91-union-fs
- install -m 0755 ${WORKDIR}/realroot ${D}/init.d/92-realroot
- install -m 0755 ${WORKDIR}/umountfs ${D}/init.d/93-umountfs
+ install -m 0755 ${UNPACKDIR}/union-fs ${D}/init.d/91-union-fs
+ install -m 0755 ${UNPACKDIR}/realroot ${D}/init.d/92-realroot
+ install -m 0755 ${UNPACKDIR}/umountfs ${D}/init.d/93-umountfs
}
FILES:${PN}:append:anaconda = " \
@@ -8,7 +8,8 @@ SRC_URI = "file://sidebar-logo.png \
file://banner_yocto2.png \
file://COPYING"
-S = "${WORKDIR}"
+S = "${WORKDIR}/sources"
+UNPACKDIR = "${S}"
inherit allarch
@@ -2,7 +2,7 @@ SYSTEMD_AUTO_ENABLE:anaconda = "disable"
do_install:append:anaconda () {
install -d ${D}${sysconfdir}/multipath
- install -m 0644 ${WORKDIR}/multipath.conf.example \
+ install -m 0644 ${UNPACKDIR}/multipath.conf.example \
${D}${sysconfdir}/multipath.conf
}