i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: Use $rmAttrs and $(RM) in more places instead of 'rm' directly.

Browse Source 
Should not result in a functional change in most cases, but it might
on some systems without full xattrs or emulation.
This commit is contained in:
Augustin Cavalier
2021-09-06 15:59:44 -04:00
parent d8ffdea39e
commit db0b7d8401
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/scripts/build_haiku_package
+1 -1
View File
@@ -115,7 +115,7 @@ $mimeset --mimedb "$mimeDB" "$contentsDir"
# create the package # create the package
if [ ! $updateOnly ]; then if [ ! $updateOnly ]; then
echo "$packageName: Creating the package ..." echo "$packageName: Creating the package ..."
rm -f "$packagePath" $rmAttrs -f "$packagePath"
$package create -q "-$compressionLevel" -i "$packageInfoPath" \ $package create -q "-$compressionLevel" -i "$packageInfoPath" \
-C "$contentsDir" "$packagePath" -C "$contentsDir" "$packagePath"
else else
src/system/boot/Jamfile
+6 -6
View File
@@ -37,7 +37,7 @@ rule BuildAoutLoader {
} }
actions BuildAoutLoader bind ELF2AOUT { actions BuildAoutLoader bind ELF2AOUT {
rm -f $(1) $(RM) -f $(1)
$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \ $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) \
$(ELF2AOUT) -o $(1) $(2) $(ELF2AOUT) -o $(1) $(2)
} }
@@ -61,11 +61,11 @@ rule BuildCoffLoader {
} }
actions BuildCoffLoader bind HACK_COFF { actions BuildCoffLoader bind HACK_COFF {
rm -f $(1) $(RM) -f $(1)
# get the address of the COFF entry # get the address of the COFF entry
$(TARGET_OBJCOPY_$(TARGET_PACKAGING_ARCH)) -O symbolsrec $(2) $(2).syms $(TARGET_OBJCOPY_$(TARGET_PACKAGING_ARCH)) -O symbolsrec $(2) $(2).syms
EP=`grep _coff_start $(2).syms | tr -d '\r' | cut -d'$' -f2` EP=`grep _coff_start $(2).syms | tr -d '\r' | cut -d'$' -f2`
rm -f $(2).syms $(RM) -f $(2).syms
# copy to XCOFF format and patch the entry point # copy to XCOFF format and patch the entry point
$(TARGET_OBJCOPY_$(TARGET_PACKAGING_ARCH)) -O $(COFF_FORMAT) --set-start="0x${EP}" $(2) $(1) $(TARGET_OBJCOPY_$(TARGET_PACKAGING_ARCH)) -O $(COFF_FORMAT) --set-start="0x${EP}" $(2) $(1)
#$(CP) $(2) $(1) #$(CP) $(2) $(1)
@@ -92,7 +92,7 @@ rule BuildBiosLoader {
} }
actions BuildBiosLoader { actions BuildBiosLoader {
rm -f $(1) $(RM) -f $(1)
$(TARGET_OBJCOPY_$(TARGET_PACKAGING_ARCH)) -O binary $(2) $(1) $(TARGET_OBJCOPY_$(TARGET_PACKAGING_ARCH)) -O binary $(2) $(1)
} }
@@ -124,7 +124,7 @@ rule BuildEFILoader {
actions BuildEFILoader actions BuildEFILoader
{ {
rm -f $(1) $(RM) -f $(1)
if [ "$(OUTPUT_TARGET)" = "binary" ]; then if [ "$(OUTPUT_TARGET)" = "binary" ]; then
# no bfd support, fake efi Pe header # no bfd support, fake efi Pe header
$(TARGET_OBJCOPY_$(TARGET_PACKAGING_ARCH)) -j .text -j .sdata -j .data \ $(TARGET_OBJCOPY_$(TARGET_PACKAGING_ARCH)) -j .text -j .sdata -j .data \
@@ -178,7 +178,7 @@ rule BuildUImageScript script : source
actions BuildUImageScript1 actions BuildUImageScript1
{ {
rm -f $(1) $(RM) -f $(1)
mkimage -A $(ARCH) -O $(FAKEOS) -T script -C none -n $(SCRIPTNAME) \ mkimage -A $(ARCH) -O $(FAKEOS) -T script -C none -n $(SCRIPTNAME) \
-d $(2) $(1) -d $(2) $(1)
} }