diff options
| author |   Richard Purdie <rpurdie@rpsys.net> | 2006-10-02 10:33:43 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2006-10-02 10:33:43 +0000 |
| commit | 4244e750c94045d8feb60a5b3b183920f765aab2 (patch) | |
| tree | 1ee5286ee5ff68d836e1f0fa9016a094728155f4 | |
| parent | 594be13fcc486e79bdbe5bcaf7a8d892b41ca82e (diff) | |
| download | openembedded-4244e750c94045d8feb60a5b3b183920f765aab2.tar.gz | |
packaged-staging.bbclass: Remove unneeded special cases
| -rw-r--r-- | classes/packaged-staging.bbclass | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index d2e22a9079..b4d52ccebe 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -22,7 +22,7 @@ # Summary: # This class will have two modes of operation: # LEETVARNAME1: repopulated staging from scratch for each packages -# LEETVARNAME2: append each package to staging +# LEETVARNAME2: append each package to staging (current behaviour) DEPLOY_DIR_PSTAGE = "${DEPLOY_DIR}/pstage" @@ -123,8 +123,6 @@ export OLD_PWD=`pwd` cd ${DEPLOY_DIR_IPK} && rm *${BUILD_ARCH}.ipk -f ; ipkg-make-index -p Packages . ; cd ${OLD_PWD} ${PSTAGE_UPDATE_CMD} ${STAGING_BASEDIR} -#blacklist packages poking in staging *and* cross -if [ ${PN} != "linux-libc-headers" ] ; then #check for generated packages if [ -e ${SPAWNFILE} ]; then oenote "List of spawned packages found: ${P}.spawn" @@ -143,10 +141,6 @@ if [ ${PN} != "linux-libc-headers" ] ; then else oenote "Spawn file not found!" fi -fi #if ${PN} - - -if [ ${PN} != "glibc-intermediate" ] ; then if [ -e ${DEPLOY_DIR_PSTAGE}/${PCROSS_PKGNAME} ]; then oenote "Cross stuff already packaged, using that instead" @@ -164,18 +158,15 @@ if [ ${PN} != "glibc-intermediate" ] ; then mkdir -p ${STAGING_LIBDIR} mkdir -p ${STAGING_INCDIR} mkdir -p ${STAGING_DATADIR}/aclocal -else - oenote "Glibc-intermediate detected!" -fi #if !glibc intermediate } do_stage_append() { -mkdir -p ${DEPLOY_DIR_PSTAGE} + mkdir -p ${DEPLOY_DIR_PSTAGE} -# list the packages currently installed in staging -${PSTAGE_LIST_CMD} ${STAGING_BASEDIR} | awk '{print $1}' > ${DEPLOY_DIR_PSTAGE}/installed-staging_list -${PSTAGE_LIST_CMD} ${CROSS_DIR} | awk '{print $1}' > ${DEPLOY_DIR_PSTAGE}/installed-cross_list + # list the packages currently installed in staging + ${PSTAGE_LIST_CMD} ${STAGING_BASEDIR} | awk '{print $1}' > ${DEPLOY_DIR_PSTAGE}/installed-staging_list + ${PSTAGE_LIST_CMD} ${CROSS_DIR} | awk '{print $1}' > ${DEPLOY_DIR_PSTAGE}/installed-cross_list if [ ${PN} != "glibc-intermediate" ] ; then @@ -230,9 +221,5 @@ if [ ${PN} != "glibc-intermediate" ] ; then ${PSTAGE_INSTALL_CMD} ${CROSS_DIR} ${DEPLOY_DIR_PSTAGE}/${PCROSS_PKGNAME} fi - -else - oenote "Glibc-intermediate detected (again)" -fi #if !glibc-intermediate } |