From 690e9e12869eb453929481ec5f999bff1e36c9b3 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 6 Aug 2006 15:58:51 +0000 Subject: packages/*/*.bb: Stop GNUism on cp. -d -> -P, -a -> pPR... Fix GNUism on the usage of cp -d as --no-derefence -> -P --deference -> -L -r -> -R -a same as -dpR -> -PpR --- packages/freedroid/freedroid_1.0.2.bb | 2 +- packages/gdal/gdal_1.3.2.bb | 2 +- packages/gdb/gdb-cross_6.3.bb | 2 +- packages/gpe-themes/gpe-theme-clearlooks_0.2.bb | 2 +- packages/gpe-themes/gpe-theme-clearlooks_0.3.bb | 2 +- packages/ixp4xx/ixp-osal_1.5.bb | 4 ++-- packages/ixp4xx/ixp-osal_2.0.bb | 4 ++-- packages/ixp4xx/ixp-osal_2.1.1.bb | 4 ++-- packages/ixp4xx/ixp-osal_2.1.bb | 4 ++-- packages/ixp4xx/ixp4xx-csr_1.4.bb | 2 +- packages/libcgicc/libcgicc_3.2.3.bb | 2 +- packages/mesa/mesa_6.0.1.bb | 8 ++++---- packages/mesa/mesa_6.4.1+cvs20060101.bb | 8 ++++---- packages/mozilla/minimo_cvs.bb | 2 +- packages/nvidia-drivers/nvidia-display_1.0-8756.bb | 4 ++-- packages/nvidia-drivers/nvidia-nforce_1.0-0310.bb | 2 +- packages/python/python-pyqt4_4.0.bb | 2 +- packages/qmake/qmake-native_1.07a.bb | 2 +- packages/qmake/qmake2-native_2.00a.bb | 2 +- packages/slutils/slutils_0.1.0.bb | 2 +- packages/txdrug/txdrug_0.1.bb | 2 +- packages/wxbase/wxbase_2.6.2.bb | 10 +++++----- packages/wxbase/wxbase_2.7+cvs.bb | 10 +++++----- packages/xqt2/xqt2_20060509.bb | 2 +- 24 files changed, 43 insertions(+), 43 deletions(-) diff --git a/packages/freedroid/freedroid_1.0.2.bb b/packages/freedroid/freedroid_1.0.2.bb index be1087d691..f246bf633b 100644 --- a/packages/freedroid/freedroid_1.0.2.bb +++ b/packages/freedroid/freedroid_1.0.2.bb @@ -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/ } diff --git a/packages/gdal/gdal_1.3.2.bb b/packages/gdal/gdal_1.3.2.bb index c445cd1274..70f435603c 100644 --- a/packages/gdal/gdal_1.3.2.bb +++ b/packages/gdal/gdal_1.3.2.bb @@ -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}../') } diff --git a/packages/gdb/gdb-cross_6.3.bb b/packages/gdb/gdb-cross_6.3.bb index 1029f7bfe0..601f4a0750 100644 --- a/packages/gdb/gdb-cross_6.3.bb +++ b/packages/gdb/gdb-cross_6.3.bb @@ -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} } diff --git a/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb b/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb index dc8f434ecc..4634b1b575 100644 --- a/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb +++ b/packages/gpe-themes/gpe-theme-clearlooks_0.2.bb @@ -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/ } diff --git a/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb b/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb index 599abee8b4..5cedd57e9c 100644 --- a/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb +++ b/packages/gpe-themes/gpe-theme-clearlooks_0.3.bb @@ -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/ } diff --git a/packages/ixp4xx/ixp-osal_1.5.bb b/packages/ixp4xx/ixp-osal_1.5.bb index 66cf9e6b06..bfb76a3fc6 100644 --- a/packages/ixp4xx/ixp-osal_1.5.bb +++ b/packages/ixp4xx/ixp-osal_1.5.bb @@ -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} diff --git a/packages/ixp4xx/ixp-osal_2.0.bb b/packages/ixp4xx/ixp-osal_2.0.bb index 84929d5cb5..4ca2543156 100644 --- a/packages/ixp4xx/ixp-osal_2.0.bb +++ b/packages/ixp4xx/ixp-osal_2.0.bb @@ -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} diff --git a/packages/ixp4xx/ixp-osal_2.1.1.bb b/packages/ixp4xx/ixp-osal_2.1.1.bb index 926d720f3a..02206fb3cf 100644 --- a/packages/ixp4xx/ixp-osal_2.1.1.bb +++ b/packages/ixp4xx/ixp-osal_2.1.1.bb @@ -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} diff --git a/packages/ixp4xx/ixp-osal_2.1.bb b/packages/ixp4xx/ixp-osal_2.1.bb index 0e5531a254..b020c9dafd 100644 --- a/packages/ixp4xx/ixp-osal_2.1.bb +++ b/packages/ixp4xx/ixp-osal_2.1.bb @@ -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} diff --git a/packages/ixp4xx/ixp4xx-csr_1.4.bb b/packages/ixp4xx/ixp4xx-csr_1.4.bb index 7146d9e402..286ecf957a 100644 --- a/packages/ixp4xx/ixp4xx-csr_1.4.bb +++ b/packages/ixp4xx/ixp4xx-csr_1.4.bb @@ -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 () { diff --git a/packages/libcgicc/libcgicc_3.2.3.bb b/packages/libcgicc/libcgicc_3.2.3.bb index 5e9c9acff1..adf5108c12 100644 --- a/packages/libcgicc/libcgicc_3.2.3.bb +++ b/packages/libcgicc/libcgicc_3.2.3.bb @@ -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} } diff --git a/packages/mesa/mesa_6.0.1.bb b/packages/mesa/mesa_6.0.1.bb index be63a32190..d8c857fef7 100644 --- a/packages/mesa/mesa_6.0.1.bb +++ b/packages/mesa/mesa_6.0.1.bb @@ -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}/ } diff --git a/packages/mesa/mesa_6.4.1+cvs20060101.bb b/packages/mesa/mesa_6.4.1+cvs20060101.bb index c39dc02d97..aca9331e00 100644 --- a/packages/mesa/mesa_6.4.1+cvs20060101.bb +++ b/packages/mesa/mesa_6.4.1+cvs20060101.bb @@ -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}/ } diff --git a/packages/mozilla/minimo_cvs.bb b/packages/mozilla/minimo_cvs.bb index 293e6b2a3e..93cdc856d1 100644 --- a/packages/mozilla/minimo_cvs.bb +++ b/packages/mozilla/minimo_cvs.bb @@ -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 diff --git a/packages/nvidia-drivers/nvidia-display_1.0-8756.bb b/packages/nvidia-drivers/nvidia-display_1.0-8756.bb index 12df834298..dd83eec800 100644 --- a/packages/nvidia-drivers/nvidia-display_1.0-8756.bb +++ b/packages/nvidia-drivers/nvidia-display_1.0-8756.bb @@ -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 } diff --git a/packages/nvidia-drivers/nvidia-nforce_1.0-0310.bb b/packages/nvidia-drivers/nvidia-nforce_1.0-0310.bb index eb9bc228a1..42b928f38a 100644 --- a/packages/nvidia-drivers/nvidia-nforce_1.0-0310.bb +++ b/packages/nvidia-drivers/nvidia-nforce_1.0-0310.bb @@ -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 } diff --git a/packages/python/python-pyqt4_4.0.bb b/packages/python/python-pyqt4_4.0.bb index 6cd91e68ec..7550e2314d 100644 --- a/packages/python/python-pyqt4_4.0.bb +++ b/packages/python/python-pyqt4_4.0.bb @@ -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/ } diff --git a/packages/qmake/qmake-native_1.07a.bb b/packages/qmake/qmake-native_1.07a.bb index 0b8c3e84ec..2a4408ad2a 100644 --- a/packages/qmake/qmake-native_1.07a.bb +++ b/packages/qmake/qmake-native_1.07a.bb @@ -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() { diff --git a/packages/qmake/qmake2-native_2.00a.bb b/packages/qmake/qmake2-native_2.00a.bb index 744588ed27..9f1af8fef2 100644 --- a/packages/qmake/qmake2-native_2.00a.bb +++ b/packages/qmake/qmake2-native_2.00a.bb @@ -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() { diff --git a/packages/slutils/slutils_0.1.0.bb b/packages/slutils/slutils_0.1.0.bb index 958fab46d5..cdb2996986 100644 --- a/packages/slutils/slutils_0.1.0.bb +++ b/packages/slutils/slutils_0.1.0.bb @@ -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 } diff --git a/packages/txdrug/txdrug_0.1.bb b/packages/txdrug/txdrug_0.1.bb index fd12180ac6..121dfdbad3 100644 --- a/packages/txdrug/txdrug_0.1.bb +++ b/packages/txdrug/txdrug_0.1.bb @@ -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 } diff --git a/packages/wxbase/wxbase_2.6.2.bb b/packages/wxbase/wxbase_2.6.2.bb index 2a41fdfa65..748d738c1c 100644 --- a/packages/wxbase/wxbase_2.6.2.bb +++ b/packages/wxbase/wxbase_2.6.2.bb @@ -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}"', \ diff --git a/packages/wxbase/wxbase_2.7+cvs.bb b/packages/wxbase/wxbase_2.7+cvs.bb index efc04b6f8c..a813788eee 100644 --- a/packages/wxbase/wxbase_2.7+cvs.bb +++ b/packages/wxbase/wxbase_2.7+cvs.bb @@ -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}"', \ diff --git a/packages/xqt2/xqt2_20060509.bb b/packages/xqt2/xqt2_20060509.bb index 1b294475a4..cde82c3f4a 100644 --- a/packages/xqt2/xqt2_20060509.bb +++ b/packages/xqt2/xqt2_20060509.bb @@ -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 -- cgit v1.2.3