Ticket #7617: changes-for-syslog-2.diff

File changes-for-syslog-2.diff, 6.2 KB (added by mmadia, 13 years ago)

  • ../haiku/build/jam/HaikuImage

     
    783783    : $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ;
    784784AddVariableToScript $(script) : dontClearImage : $(HAIKU_DONT_CLEAR_IMAGE) ;
    785785AddVariableToScript $(script) : updateOnly : [ IsUpdateHaikuImageOnly ] ;
     786AddVariableToScript $(script) : stripOptionalPackageDebugSymbols
     787    : $(HAIKU_STRIP_DEBUG_FROM_OPTIONAL_PACKAGES) ;
    786788AddTargetVariableToScript $(script) : <build>addattr ;
    787789AddTargetVariableToScript $(script) : <build>bfs_shell : bfsShell ;
    788790AddTargetVariableToScript $(script) : <build>fs_shell_command : fsShellCommand ;

  • ../haiku/build/jam/HaikuCD

     
    2828AddVariableToScript $(script) : cdLabel : $(HAIKU_CD_LABEL) ;
    2929AddVariableToScript $(script) : addBuildCompatibilityLibDir
    3030    : $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ;
     31AddVariableToScript $(script) : stripOptionalPackageDebugSymbols
     32    : $(HAIKU_STRIP_DEBUG_FROM_OPTIONAL_PACKAGES) ;
    3133AddTargetVariableToScript $(script) : <build>addattr ;
    3234AddTargetVariableToScript $(script) : <build>copyattr ;
    3335AddTargetVariableToScript $(script) : <build>rc ;

  • ../haiku/build/jam/UserBuildConfig.ReadMe

     
    6262HAIKU_IMAGE_DIR     = /tmp ;
    6363HAIKU_IMAGE_SIZE    = 100 ;
    6464
     65# Enable stripping the debug symbols from optional packages.
     66HAIKU_STRIP_DEBUG_FROM_OPTIONAL_PACKAGES = 1 ;
     67
    6568# Set image volume label to "Walter". Default label is "Haiku".
    6669HAIKU_IMAGE_LABEL   = Walter ;
    6770

  • ../haiku/build/jam/ReleaseBuildProfiles

     
    1616        HAIKU_ROOT_USER_REAL_NAME = "Yourself" ;
    1717        AddGroupToHaikuImage party : 101 : user sshd ;
    1818        HAIKU_IMAGE_HOST_NAME = shredder ;
    19         HAIKU_IMAGE_SIZE = 790 ;
     19        HAIKU_IMAGE_SIZE = 690 ;
     20        HAIKU_STRIP_DEBUG_FROM_OPTIONAL_PACKAGES = 1 ;
    2021
    2122        AddOptionalHaikuImagePackages TimGMSoundFont TrackerNewTemplates
    2223            WQY-MicroHei ;
    … …  
    3839        AddGroupToHaikuImage party : 101 : user sshd ;
    3940        HAIKU_IMAGE_HOST_NAME = shredder ;
    4041        HAIKU_IMAGE_SIZE = 500 ;
     42        HAIKU_STRIP_DEBUG_FROM_OPTIONAL_PACKAGES = 1 ;
    4143
    4244        AddOptionalHaikuImagePackages Pe Nano Vision P7zip XZ-Utils ;
    4345        AddOptionalHaikuImagePackages Development Subversion OpenSSH OpenSSL ;

  • ../haiku/build/scripts/build_haiku_image

     
    1616# dontClearImage
    1717# isVMwareImage
    1818# optionalPackageDescriptions
     19# stripOptionalPackageDebugSymbols
    1920#
    2021# addattr
    2122# copyattr
    … …  
    141142fi
    142143
    143144
     145stripDebugInfo()
     146{
     147    file="$1"
     148
     149    # Determine whether the file is an ELF file by checking the ELF signature,
     150    # or at least the printable characters.
     151    elfMarker=`dd "if=$file" bs=1 skip=1 count=3 2> /dev/null`
     152    if [ "$elfMarker" = 'ELF' ]; then
     153        # make user-writable first -- some files aren't
     154        chmod u+w "$file"
     155        strip --strip-debug "$file"
     156    fi
     157}
     158
    144159extractFile()
    145160{
    146161    # extractFile <archive> <directory>
    … …  
    173188        rm $extractDir/.OptionalPackageDescription
    174189    fi
    175190
     191    if [ "$stripOptionalPackageDebugSymbols" = "1" ]; then
     192        # strip executables in common/bin
     193        if [ -d $extractDir/common/bin ]; then
     194            for file in `find $extractDir/common/bin -type f -a -perm +100 \
     195                    -a -size +1k`; do
     196                stripDebugInfo "$file"
     197            done
     198        fi
     199
     200        # strip libraries in common/lib
     201        if [ -d $extractDir/common/lib ]; then
     202            for file in `find $extractDir/common/lib -type f -a -size +1k \
     203                    -a -name lib\*`; do
     204                stripDebugInfo "$file"
     205            done
     206        fi
     207    fi
     208
    176209    $cp -r "${sPrefix}$extractDir/$extractedSubDir/." "${tPrefix}$targetExtractedDir"
    177210
    178211    $rmAttrs -rf "$extractDir"
    … …  
    216249        fi
    217250
    218251        $bfsShell --initialize $imageOffsetFlags "$imagePath" \
    219             "$imageLabel" "block_size 2048"
     252            "$imageLabel" "block_size 1024"
    220253        $makebootable $imageOffsetFlags "$imagePath"
    221254    fi
    222255

  • ../haiku/src/system/kernel/device_manager/IOCache.cpp

     
    380380            status_t error = _TransferPages(firstMissing - firstPageOffset,
    381381                missingPages, false, isVIP);
    382382            if (error != B_OK) {
     383                dprintf("IOCache::_TransferRequestLine(): Failed to read into "
     384                    "cache (offset: %" B_PRIdOFF ", length: %" B_PRIuSIZE "), "
     385                    "trying uncached read (offset: %" B_PRIdOFF ", length: %"
     386                    B_PRIuSIZE ")\n", (off_t)firstMissing * B_PAGE_SIZE,
     387                    (size_t)missingPages * B_PAGE_SIZE, requestOffset,
     388                    requestLength);
     389
    383390                _DiscardPages(firstMissing - firstPageOffset, missingPages);
    384391
    385                 dprintf("IOCache: falling back to uncached transfer, offset %"
    386                     B_PRIiOFF ", length %" B_PRIuSIZE "\n", requestOffset,
    387                     requestLength);
    388392
     393//              dprintf("IOCache: falling back to uncached transfer, offset %"
     394//                  B_PRIiOFF ", length %" B_PRIuSIZE "\n", requestOffset,
     395//                  requestLength);
     396
    389397                // Try again using an uncached transfer
    390398                return _TransferRequestLineUncached(request, lineOffset,
    391399                    requestOffset, requestLength);

  • ../haiku/src/add-ons/kernel/drivers/disk/scsi/scsi_cd/scsi_cd.cpp

     
    2828#include "IOSchedulerSimple.h"
    2929
    3030
    31 //#define TRACE_CD_DISK
     31#define TRACE_CD_DISK
    3232#ifdef TRACE_CD_DISK
    3333#   define TRACE(x...) dprintf("scsi_cd: " x)
    3434#else