[oe-commits] Holger Hans Peter Freyther : bashism: Move away from pushd/ popd as it is only available for bash
GIT User account
git at amethyst.openembedded.net
Wed Oct 29 13:29:01 UTC 2008
Module: openembedded.git
Branch: holger/openmoko-merges
Commit: 509a1ba26dc5f08b55c726187c40b6858dbd8fea
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=509a1ba26dc5f08b55c726187c40b6858dbd8fea
Author: Holger Hans Peter Freyther <zecke at openmoko.org>
Date: Mon Jul 28 10:33:37 2008 +0200
bashism: Move away from pushd/popd as it is only available for bash
---
packages/freenote/freenote_1.12.0.bb | 5 +++--
packages/mono/mono_1.2.5.1.bb | 8 ++++----
packages/mono/mono_1.2.6.bb | 8 ++++----
packages/mono/mono_svn.bb | 8 ++++----
packages/nunome/nunome_1.0.2.bb | 8 ++++----
packages/xorg-xserver/xserver-xorg_cvs.bb | 4 +++-
6 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/packages/freenote/freenote_1.12.0.bb b/packages/freenote/freenote_1.12.0.bb
index e28689e..8f77776 100644
--- a/packages/freenote/freenote_1.12.0.bb
+++ b/packages/freenote/freenote_1.12.0.bb
@@ -16,8 +16,9 @@ do_configure_prepend() {
mv -f FreeNote subdir1
mv -f FreeNoteSetup subdir2
printf "TEMPLATE=subdirs\nSUBDIRS=subdir1 subdir2\n" >> freenote.pro
- pushd ${S}/subdir1 && rm *.pro && qmake -project && echo "TARGET=FreeNote" >> subdir1.pro && popd
- pushd ${S}/subdir2 && rm *.pro && qmake -project && echo "TARGET=FreeNoteSetup" >> subdir2.pro && popd
+ cd ${S}/subdir1 && rm *.pro && qmake -project && echo "TARGET=FreeNote" >> subdir1.pro
+ cd ${S}/subdir2 && rm *.pro && qmake -project && echo "TARGET=FreeNoteSetup" >> subdir2.pro
+ cd ${S}
}
do_install() {
diff --git a/packages/mono/mono_1.2.5.1.bb b/packages/mono/mono_1.2.5.1.bb
index d073aa7..8c56d9b 100644
--- a/packages/mono/mono_1.2.5.1.bb
+++ b/packages/mono/mono_1.2.5.1.bb
@@ -14,9 +14,9 @@ EXTRA_OECONF += " --disable-mcs-build "
do_install_prepend() {
install -d ${D}
- pushd ${D}
+ cd ${D}
tar -xzf ${STAGING_DATADIR_NATIVE}/mono-mcs/mono-mcs-${PV}.tar.gz
- popd
+ cd ${S}
}
do_install_append() {
@@ -24,11 +24,11 @@ do_install_append() {
# however, jay is not being cross-compiled and thus only
# available for the buildhost architecture, so remove it
# entirely
- pushd ${D}
+ cd ${D}
rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \
./usr/share/jay/README.jay \
./usr/bin/jay
- popd
+ cd ${S}
# Not packaged with the default rules and apparently
# not used for anything
diff --git a/packages/mono/mono_1.2.6.bb b/packages/mono/mono_1.2.6.bb
index f436a67..c039828 100644
--- a/packages/mono/mono_1.2.6.bb
+++ b/packages/mono/mono_1.2.6.bb
@@ -12,9 +12,9 @@ EXTRA_OECONF += " --disable-mcs-build "
do_install_prepend() {
install -d ${D}
- pushd ${D}
+ cd ${D}
tar -xzf ${STAGING_DATADIR_NATIVE}/mono-mcs/mono-mcs-${PV}.tar.gz
- popd
+ cd ${S}
}
do_install_append() {
@@ -22,11 +22,11 @@ do_install_append() {
# however, jay is not being cross-compiled and thus only
# available for the buildhost architecture, so remove it
# entirely
- pushd ${D}
+ cd ${D}
rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \
./usr/share/jay/README.jay \
./usr/bin/jay
- popd
+ cd ${S}
# Not packaged with the default rules and apparently
# not used for anything
diff --git a/packages/mono/mono_svn.bb b/packages/mono/mono_svn.bb
index a42ddd8..a5ba966 100644
--- a/packages/mono/mono_svn.bb
+++ b/packages/mono/mono_svn.bb
@@ -13,9 +13,9 @@ EXTRA_OECONF += " --disable-mcs-build "
do_install_prepend() {
install -d ${D}
- pushd ${D}
+ cd ${D}
tar -xzf ${STAGING_DATADIR_NATIVE}/mono-mcs/mono-mcs-${PV}.tar.gz
- popd
+ cd ${S}
}
do_install_append() {
@@ -23,11 +23,11 @@ do_install_append() {
# however, jay is not being cross-compiled and thus only
# available for the buildhost architecture, so remove it
# entirely
- pushd ${D}
+ cd ${D}
rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \
./usr/share/jay/README.jay \
./usr/bin/jay
- popd
+ cd ${S}
# Not packaged with the default rules and apparently
# not used for anything
diff --git a/packages/nunome/nunome_1.0.2.bb b/packages/nunome/nunome_1.0.2.bb
index 4dd1519..bf297b0 100644
--- a/packages/nunome/nunome_1.0.2.bb
+++ b/packages/nunome/nunome_1.0.2.bb
@@ -21,10 +21,10 @@ do_configure_prepend() {
sed -i -e 's,/opt/QtPalmtop/bin/,${bindir}/,g' "${S}/ui/nunome.h"
sed -i -e 's,/opt/QtPalmtop/,${palmtopdir}/,g' "${S}/ui/nunome.h"
printf "TEMPLATE=subdirs\nSUBDIRS=Nnmlib server ui dicman ui\n" >nunome.pro
- pushd Nnmlib && qmake -project -t lib && popd
- pushd server && qmake -project && printf "LIBS+=-lNnmlib\nTARGET=server.bin\n" >> server.pro && popd
- pushd dicman && qmake -project && printf "LIBS+=-lnunome -lNnmlib\nTARGET=dicman.bin\n" >> dicman.pro && popd
- pushd ui && qmake -project -t lib && printf "LIBS+=-lNnmlib\nTARGET=nunome\n" >> ui.pro && popd
+ cd Nnmlib && qmake -project -t lib && cd ../
+ cd server && qmake -project && printf "LIBS+=-lNnmlib\nTARGET=server.bin\n" >> server.pro && cd ../
+ cd dicman && qmake -project && printf "LIBS+=-lnunome -lNnmlib\nTARGET=dicman.bin\n" >> dicman.pro && cd ../
+ cd ui && qmake -project -t lib && printf "LIBS+=-lNnmlib\nTARGET=nunome\n" >> ui.pro && cd ../
find . -name "moc*"|xargs rm -f
find . -name "Makefile"|xargs rm -f
}
diff --git a/packages/xorg-xserver/xserver-xorg_cvs.bb b/packages/xorg-xserver/xserver-xorg_cvs.bb
index c1574a6..c120dc7 100644
--- a/packages/xorg-xserver/xserver-xorg_cvs.bb
+++ b/packages/xorg-xserver/xserver-xorg_cvs.bb
@@ -54,7 +54,9 @@ do_install() {
do_stage() {
install -d ${STAGING_INCDIR}/xserver-xorg
for i in i810 via; do
- pushd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/; popd
+ cd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/
done
+
+ cd ${S}
install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xorg/
}
More information about the Openembedded-commits
mailing list