]> git.openpandora.org Git - openembedded.git/commitdiff
packages/*/*.bb: Stop GNUism on cp. -d -> -P, -a -> pPR...
authorHolger Freyther <zecke@selfish.org>
Sun, 6 Aug 2006 15:58:51 +0000 (15:58 +0000)
committerHolger Freyther <zecke@selfish.org>
Sun, 6 Aug 2006 15:58:51 +0000 (15:58 +0000)
    Fix GNUism on the usage of cp
    -d as --no-derefence -> -P
    --deference          -> -L
    -r                   -> -R
    -a same as -dpR      -> -PpR

24 files changed:
packages/freedroid/freedroid_1.0.2.bb
packages/gdal/gdal_1.3.2.bb
packages/gdb/gdb-cross_6.3.bb
packages/gpe-themes/gpe-theme-clearlooks_0.2.bb
packages/gpe-themes/gpe-theme-clearlooks_0.3.bb
packages/ixp4xx/ixp-osal_1.5.bb
packages/ixp4xx/ixp-osal_2.0.bb
packages/ixp4xx/ixp-osal_2.1.1.bb
packages/ixp4xx/ixp-osal_2.1.bb
packages/ixp4xx/ixp4xx-csr_1.4.bb
packages/libcgicc/libcgicc_3.2.3.bb
packages/mesa/mesa_6.0.1.bb
packages/mesa/mesa_6.4.1+cvs20060101.bb
packages/mozilla/minimo_cvs.bb
packages/nvidia-drivers/nvidia-display_1.0-8756.bb
packages/nvidia-drivers/nvidia-nforce_1.0-0310.bb
packages/python/python-pyqt4_4.0.bb
packages/qmake/qmake-native_1.07a.bb
packages/qmake/qmake2-native_2.00a.bb
packages/slutils/slutils_0.1.0.bb
packages/txdrug/txdrug_0.1.bb
packages/wxbase/wxbase_2.6.2.bb
packages/wxbase/wxbase_2.7+cvs.bb
packages/xqt2/xqt2_20060509.bb

index be1087d6912e70688b99978f0052f9cc8ed68e96..f246bf633be436b12a3b1c33471cb003dcdb2a32 100644 (file)
@@ -21,5 +21,5 @@ do_install() {
        install -d ${D}${bindir}
        install -m 0755 src/freedroid ${D}${bindir}
         install -d ${D}${datadir}/freedroid/
-       cp -a graphics map sound ${D}${datadir}/freedroid/
+       cp -pPR graphics map sound ${D}${datadir}/freedroid/
 }
index c445cd1274aef240a5c8946ca0a27688849ab4c4..70f435603cfca83738f74ab6f089c89fb0e99824 100644 (file)
@@ -33,6 +33,6 @@ do_compile() {
 
 do_package_prepend() {
        # the brokenness....
-       os.system('cp -a ${D}${D}* ${D}../')
+       os.system('cp -pPR ${D}${D}* ${D}../')
 }      
 
index 1029f7bfe0d81263bcaaaa07421465df89b3e5eb..601f4a07502c249335ca4217a259cd8846fb1ef6 100644 (file)
@@ -33,6 +33,6 @@ do_configure () {
 
 do_stage() {
        oe_runmake 'DESTDIR=${CROSS_DIR}' install
-       cp -a ${CROSS_DIR}${prefix}/* ${CROSS_DIR}
+       cp -pPR ${CROSS_DIR}${prefix}/* ${CROSS_DIR}
        rm -rf ${CROSS_DIR}${prefix}
 }
index dc8f434ecca3d259f1546d86539bea4986261b51..4634b1b5758d3d79f0f38a56559091fec6a72567 100644 (file)
@@ -13,7 +13,7 @@ SRC_URI =             "http://dominion.kabel.utwente.nl/koen/pda/files/${P}.tar.gz"
 
 do_install() {
 install -d ${D}${datadir}/themes/
-cp -dpR ${WORKDIR}/Clearlooks ${D}${datadir}/themes/ 
+cp -PpR ${WORKDIR}/Clearlooks ${D}${datadir}/themes/ 
 }
 
 
index 599abee8b4e9add49435980923848c99caf4c1f0..5cedd57e9c5f3a6d73954d769f025a09dc69302c 100644 (file)
@@ -13,7 +13,7 @@ SRC_URI =             "http://dominion.kabel.utwente.nl/koen/pda/files/${P}.tar.gz"
 
 do_install() {
 install -d ${D}${datadir}/themes/
-cp -dpR ${WORKDIR}/Clearlooks ${D}${datadir}/themes/ 
+cp -PpR ${WORKDIR}/Clearlooks ${D}${datadir}/themes/ 
 }
 
 
index 66cf9e6b067292329f91b81f6ea0839af6779289..bfb76a3fc62fa7cdb2a03725b505af883055c0c6 100644 (file)
@@ -51,9 +51,9 @@ do_stage () {
 
        # First the include files, maintain the tree structure (ixp4xx-csr
        # expects the exact same tree)
-       cp -rf --dereference include ${OSAL_DIR}
+       cp -RLf include ${OSAL_DIR}
        install -d ${OSAL_DIR}/os/linux
-       cp -rf --dereference os/linux/include ${OSAL_DIR}/os/linux
+       cp -RLf os/linux/include ${OSAL_DIR}/os/linux
 
        # Install the library/object
        install -d ${OSAL_DIR}/${OSAL_PATH}
index 84929d5cb5d39ebab2081eac971e13dbf7c10dc1..4ca2543156d15021b16e863e69bcb9854765ee97 100644 (file)
@@ -61,9 +61,9 @@ do_stage () {
 
        # First the include files, maintain the tree structure (ixp4xx-csr
        # expects the exact same tree)
-       cp -rf --dereference include ${OSAL_DIR}
+       cp -RLf include ${OSAL_DIR}
        install -d ${OSAL_DIR}/os/linux
-       cp -rf --dereference os/linux/include ${OSAL_DIR}/os/linux
+       cp -RLf os/linux/include ${OSAL_DIR}/os/linux
 
        # Install the library/object
        install -d ${OSAL_DIR}/${OSAL_PATH}
index 926d720f3aadaee3dcc80c0bbccda9381f6eb8ed..02206fb3cf40f43749a3743924bed20474e25d5f 100644 (file)
@@ -80,9 +80,9 @@ do_stage () {
 
        # First the include files, maintain the tree structure (ixp4xx-csr
        # expects the exact same tree)
-       cp -rf --dereference include ${OSAL_DIR}
+       cp -RLf include ${OSAL_DIR}
        install -d ${OSAL_DIR}/os/linux
-       cp -rf --dereference os/linux/include ${OSAL_DIR}/os/linux
+       cp -RLf os/linux/include ${OSAL_DIR}/os/linux
 
        # Install the library/object
        install -d ${OSAL_DIR}/${OSAL_PATH}
index 0e5531a254b3470ad53a6a66285452196c631fe5..b020c9dafd78e3d4d96702756412146416ad0b78 100644 (file)
@@ -68,9 +68,9 @@ do_stage () {
 
        # First the include files, maintain the tree structure (ixp4xx-csr
        # expects the exact same tree)
-       cp -rf --dereference include ${OSAL_DIR}
+       cp -RLf include ${OSAL_DIR}
        install -d ${OSAL_DIR}/os/linux
-       cp -rf --dereference os/linux/include ${OSAL_DIR}/os/linux
+       cp -RLf os/linux/include ${OSAL_DIR}/os/linux
 
        # Install the library/object
        install -d ${OSAL_DIR}/${OSAL_PATH}
index 7146d9e4022ae2e48dfa6687629acb229c3e223a..286ecf957a9ca51d7a6e762053f612b597089680 100644 (file)
@@ -54,7 +54,7 @@ do_compile () {
 do_stage () {
        install -d ${STAGING_INCDIR}/linux/ixp4xx-csr
        install -m 0644 src/include/*.h ${STAGING_INCDIR}/linux/ixp4xx-csr/
-       cp -rf --dereference src/linux/* ${STAGING_INCDIR}/linux/ixp4xx-csr/
+       cp -RLf src/linux/* ${STAGING_INCDIR}/linux/ixp4xx-csr/
 }
 
 do_install () {
index 5e9c9acff1c3b166dd8422cb38c7a48e04741816..adf5108c12ffada03ce5fce89d06a0d32f3ee4a4 100644 (file)
@@ -10,6 +10,6 @@ inherit autotools
 
 do_stage () {
        install -d ${STAGING_INCDIR}/cgicc
-       cp --dereference -R cgicc/*.h ${STAGING_INCDIR}/cgicc
+       cp -LR cgicc/*.h ${STAGING_INCDIR}/cgicc
        oe_libinstall -C cgicc libcgicc ${STAGING_LIBDIR}
 }
index be63a3219067a2a6071cf80781a0a1cc19a617ee..d8c857fef79ab5e97f546136aa2d1ac4da647c6b 100644 (file)
@@ -14,12 +14,12 @@ do_compile() {
 
 do_install() {
        install -d ${D}${libdir}
-       cp -pd lib/* ${D}${libdir}/
+       cp -pP lib/* ${D}${libdir}/
        install -d ${D}${includedir}
-       cp -r include/GL ${D}${includedir}/
+       cp -R include/GL ${D}${includedir}/
 }
 
 do_stage() {
-        cp -pd lib/* ${STAGING_LIBDIR}/
-        cp -r include/GL ${STAGING_INCDIR}/
+        cp -pP lib/* ${STAGING_LIBDIR}/
+        cp -R include/GL ${STAGING_INCDIR}/
 }
index c39dc02d973e3d662388ccb2e725abb9d94d62ba..aca9331e00c7bfd4e1933d1d088cfb6a76483ae6 100644 (file)
@@ -34,12 +34,12 @@ do_compile() {
 
 do_install() {
        install -d ${D}${libdir}
-       cp -pd lib/* ${D}${libdir}/
+       cp -pP lib/* ${D}${libdir}/
        install -d ${D}${includedir}
-       cp -r include/GL ${D}${includedir}/
+       cp -R include/GL ${D}${includedir}/
 }
 
 do_stage() {
-        cp -pd lib/* ${STAGING_LIBDIR}/
-        cp -r include/GL ${STAGING_INCDIR}/
+        cp -pP lib/* ${STAGING_LIBDIR}/
+        cp -R include/GL ${STAGING_INCDIR}/
 }
index 293e6b2a3efbca2e6cdaf0f346ded9265f94bbe2..93cdc856d1596005c35fb2fd8ef7b08c8525ea04 100644 (file)
@@ -34,7 +34,7 @@ do_install () {
        oe_runmake package
        cd ${S}
        mkdir -p ${mozdir}
-       cp -rL $MOZ_OBJDIR/dist/minimo/* ${mozdir}/
+       cp -RL $MOZ_OBJDIR/dist/minimo/* ${mozdir}/
        mkdir -p ${D}${datadir}/applications
        install -m 0644 ${WORKDIR}/minimo.desktop ${D}${datadir}/applications/minimo.desktop
        mkdir -p ${D}${datadir}/pixmaps
index 12df834298d5e9f1505c9162c76d17270780f199..dd83eec80066d06c7008b4554b6ce7090b1159ab 100644 (file)
@@ -30,13 +30,13 @@ do_install() {
 
        install -d ${D}/usr
        for dir in bin include lib share ; do
-               cp -a ${WORKDIR}/${PKG_BASENAME}/usr/$dir ${D}/usr/
+               cp -pPR ${WORKDIR}/${PKG_BASENAME}/usr/$dir ${D}/usr/
        done
        
        #X11R7.0 style...
        install -d ${D}/usr/lib/xorg/
        cp ${WORKDIR}/${PKG_BASENAME}/usr/X11R6/lib/lib* ${D}/usr/lib/
-       cp -a ${WORKDIR}/${PKG_BASENAME}/usr/X11R6/lib/modules ${D}/usr/lib/xorg/
+       cp -pPR ${WORKDIR}/${PKG_BASENAME}/usr/X11R6/lib/modules ${D}/usr/lib/xorg/
        ln -s libglx.so.1.0.8756 ${D}/usr/lib/xorg/modules/extensions/libglx.so
        
 }
index eb9bc228a115ccbb89041678ee07adcc942ec7ff..42b928f38a6f53cd1630c19ba22ba4e7f5fd6e62 100644 (file)
@@ -59,7 +59,7 @@ do_install() {
 
        install -d ${D}/usr
        for dir in usr/bin nvsound/lib ; do
-               cp -a ${S}/$dir ${D}/usr/
+               cp -pPR ${S}/$dir ${D}/usr/
        done
        
 }
index 6cd91e68ec0020dee606c184be9cb58976f798c9..7550e2314d3532650210e6468b73ea78ed47dd0d 100644 (file)
@@ -63,7 +63,7 @@ do_install() {
                echo "from PyQt4.${module} import *\n" >> ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/Qt.py
                install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/${module}.so
     done
-       cp -a elementtree ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/
+       cp -pPR elementtree ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/
        cp __init__.py ${D}${libdir}/${PYTHON_DIR}/site-packages/PyQt4/
 }
 
index 0b8c3e84ecf9ff744e7dec136bfe436c4c868f0a..2a4408ad2a751651eae95f315085633d9c1e6bff 100644 (file)
@@ -39,7 +39,7 @@ do_compile() {
 do_stage() {
        install -m 0755 bin/qmake ${STAGING_BINDIR}
        install -d ${QMAKE_MKSPEC_PATH}
-       cp -dfR mkspecs/* ${QMAKE_MKSPEC_PATH}
+       cp -fPR mkspecs/* ${QMAKE_MKSPEC_PATH}
 }
 
 do_install() {
index 744588ed274131286ccce3a993fc34500fc67b8d..9f1af8fef205bd36783feb56d00b19e0d64e9111 100644 (file)
@@ -42,7 +42,7 @@ do_compile() {
 do_stage() {
        install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake2
        install -d ${STAGING_DIR}/${CROSS_SYS}/qt4/
-       cp -dfR mkspecs ${STAGING_DIR}/${CROSS_SYS}/qt4/
+       cp -PfR mkspecs ${STAGING_DIR}/${CROSS_SYS}/qt4/
 }
 
 do_install() {
index 958fab46d5a95f6e6a42291ed7f3927c37753fca..cdb29969866cadb2743c6ec945f5131157c0426c 100644 (file)
@@ -21,7 +21,7 @@ do_fetch() {
        for u in ${UTILS}
        do
                install -d ${S}/$u
-               cp -dfR `ls -dp ${FILESDIR}/$u/*|grep -v SCCS` ${S}/$u/
+               cp -PfR `ls -dp ${FILESDIR}/$u/*|grep -v SCCS` ${S}/$u/
        done
 }
 
index fd12180ac60054b47bd6f18ffa45744cc2c6254e..121dfdbad376b7453f71d17d3a0eb359c235e864 100644 (file)
@@ -20,6 +20,6 @@ do_configure_prepend() {
 
 do_install() {
         install -d ${D}${palmtopdir}
-       cp -dfr `ls -dp ${WORKDIR}/${palmtopdir}/*|grep -v SCCS` ${D}${palmtopdir}/
+       cp -Pfr `ls -dp ${WORKDIR}/${palmtopdir}/*|grep -v SCCS` ${D}${palmtopdir}/
         install -D -m 755 txdrug ${D}${palmtopdir}/bin/txdrug
 }
index 2a41fdfa654575a64045ac9e6d62082aa4f092a9..748d738c1c0a3bae45197bb0bcf2fe20d73704bf 100644 (file)
@@ -23,11 +23,11 @@ do_configure() {
 
 do_stage() {
        install -d ${STAGING_INCDIR}/wx-2.6/wx
-       cp -pr include/wx ${STAGING_INCDIR}/wx-2.6      
-       cp -pr lib/libwx* ${STAGING_LIBDIR}
-       cp -pr lib/wx     ${STAGING_LIBDIR}
-       cp -pr build/bakefiles/wxpresets/presets  ${STAGING_DATADIR}/bakefile
-       cp -pr wxwin.m4                           ${STAGING_DATADIR}/aclocal            
+       cp -pR include/wx ${STAGING_INCDIR}/wx-2.6      
+       cp -pR lib/libwx* ${STAGING_LIBDIR}
+       cp -pR lib/wx     ${STAGING_LIBDIR}
+       cp -pR build/bakefiles/wxpresets/presets  ${STAGING_DATADIR}/bakefile
+       cp -pR wxwin.m4                           ${STAGING_DATADIR}/aclocal            
        ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.6 ${STAGING_BINDIR}/wx-config
        sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
            -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
index efc04b6f8c35017748c635361acfdf8457076125..a813788eeebb10eea134197bcd28e64a3c57b40c 100644 (file)
@@ -24,11 +24,11 @@ do_configure() {
 
 do_stage() {
        install -d ${STAGING_INCDIR}/wx-2.7/wx
-       cp -pr include/wx ${STAGING_INCDIR}/wx-2.7      
-       cp -pr lib/libwx* ${STAGING_LIBDIR}
-       cp -pr lib/wx     ${STAGING_LIBDIR}
-       cp -pr build/bakefiles/wxpresets/presets  ${STAGING_DATADIR}/bakefile
-       cp -pr wxwin.m4                           ${STAGING_DATADIR}/aclocal
+       cp -pR include/wx ${STAGING_INCDIR}/wx-2.7      
+       cp -pR lib/libwx* ${STAGING_LIBDIR}
+       cp -pR lib/wx     ${STAGING_LIBDIR}
+       cp -pR build/bakefiles/wxpresets/presets  ${STAGING_DATADIR}/bakefile
+       cp -pR wxwin.m4                           ${STAGING_DATADIR}/aclocal
        ln -sf ${STAGING_LIBDIR}/wx/config/${TARGET_PREFIX}base-ansi-release-2.7 ${STAGING_BINDIR}/wx-config
        sed -e s,'wxconfdir=".*"','wxconfigdir="${STAGING_LIBDIR}/wx/config"', \
            -e s,'bindir=".*"','bindir="${STAGING_BINDIR}"', \
index 1b294475a41357109c52bdd057b80245b096fb51..cde82c3f4a5a79149d1c0b35db5934c4a7ad8532 100644 (file)
@@ -75,7 +75,7 @@ do_configure() {
 do_compile() {
     export TOPDIR=${TOPDIR}
     mkdir -p programs/Xserver/hw/xqt
-    #cp -r ../xqt-driver/* programs/Xserver/hw/xqt
+    #cp -R ../xqt-driver/* programs/Xserver/hw/xqt
     (cd programs/Xserver/hw/xqt && ln -s ../../../../../xqt2/xfree86/xqt-driver/* .)
        unset CC
        make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" clean imake