From 111e76b7554094804afe10b64ba15018356cf3c8 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Thu, 10 Oct 2013 00:39:15 +0200 Subject: [PATCH] Properly canonically name the boot loader package --- build/jam/images/HaikuImage | 2 +- build/jam/images/HaikuImageBootstrap | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/jam/images/HaikuImage b/build/jam/images/HaikuImage index 6a352b7838..e5ec8cce2f 100644 --- a/build/jam/images/HaikuImage +++ b/build/jam/images/HaikuImage @@ -216,12 +216,12 @@ SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs bindfs btrfs cdda exfat ext2 fat iso9660 nfs include [ FDirName $(HAIKU_BUILD_RULES_DIR) HaikuPackages ] ; AddPackageFilesToHaikuImage system : + haiku_loader.hpkg haiku.hpkg haiku_$(TARGET_PACKAGING_ARCHS[2-]).hpkg : nameFromMetaInfo ; -AddPackageFilesToHaikuImage system : haiku_loader.hpkg ; AddSymlinkToHaikuImage home Desktop : /boot/home : Home ; diff --git a/build/jam/images/HaikuImageBootstrap b/build/jam/images/HaikuImageBootstrap index 9be515c0fb..8978e64e7d 100644 --- a/build/jam/images/HaikuImageBootstrap +++ b/build/jam/images/HaikuImageBootstrap @@ -173,12 +173,12 @@ SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs bindfs btrfs exfat ext2 fat iso9660 include [ FDirName $(HAIKU_BUILD_RULES_DIR) HaikuPackages ] ; AddPackageFilesToHaikuImage system : + haiku_loader.hpkg haiku.hpkg haiku_$(TARGET_PACKAGING_ARCHS[2-]).hpkg : nameFromMetaInfo ; -AddPackageFilesToHaikuImage system : haiku_loader.hpkg ; # build and add the source package directory and a haikuports.config file