diff options
-rw-r--r-- | packages/freenote/freenote_1.12.0.bb | 5 | ||||
-rw-r--r-- | packages/mono/mono_1.2.5.1.bb | 8 | ||||
-rw-r--r-- | packages/mono/mono_1.2.6.bb | 8 | ||||
-rw-r--r-- | packages/mono/mono_svn.bb | 8 | ||||
-rw-r--r-- | packages/nunome/nunome_1.0.2.bb | 8 | ||||
-rw-r--r-- | 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 e28689ebf0..8f77776131 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 d073aa7d98..8c56d9b835 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 f436a67df5..c039828180 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 a42ddd8231..a5ba966796 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 4dd1519536..bf297b0699 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 c1574a621b..c120dc713d 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/ } |