Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

filename: use standard naming for builds #1

Open
wants to merge 1 commit into
base: typhoon-x86
Choose a base branch
from
Open

filename: use standard naming for builds #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,14 @@ BUILD_TOP := $(shell pwd)

ifneq ($(filter x86%,$(TARGET_ARCH)),)
LOCAL_PATH := $(call my-dir)
VERSION=$(shell date +%Y%m%d%H%M)

# See if RELEASE_OS_TITLE is defined, and if not, use the current title
ifeq ($(RELEASE_OS_TITLE),)
RELEASE_OS_TITLE := BlissOS-$(VERSION)
else
RELEASE_OS_TITLE := $(RELEASE_OS_TITLE)
endif

include $(CLEAR_VARS)
LOCAL_IS_HOST_MODULE := true
Expand Down Expand Up @@ -179,12 +185,17 @@ ROM_VENDOR_VERSION := $(RELEASE_OS_TITLE)-$(TARGET_ARCH)-$(shell date +%Y%m%d%H%
endif

BUILD_NAME_VARIANT := $(ROM_VENDOR_VERSION)
ifeq ($(BLISS_BUILD_ZIP),)
ROM_VENDOR_VERSION := $(RELEASE_OS_TITLE)$(BLISS_SPECIAL_VARIANT)-$(TARGET_ARCH)-$(shell date +%Y%m%d%H)
else
ROM_VENDOR_VERSION := $(BLISS_BUILD_ZIP)
endif

ISO_IMAGE := $(PRODUCT_OUT)/$(BLISS_BUILD_ZIP).iso
ISO_IMAGE := $(PRODUCT_OUT)/$(ROM_VENDOR_VERSION).iso
$(ISO_IMAGE): $(boot_dir) $(BUILT_IMG)
# Generate Changelog
bash bootable/newinstaller/tools/changelog
$(hide) mv Changelog.txt $(PRODUCT_OUT)/Changelog-$(BLISS_BUILD_ZIP).txt
$(hide) mv Changelog.txt $(PRODUCT_OUT)/Changelog-$(ROM_VENDOR_VERSION).txt
@echo ----- Making iso image ------
$(hide) sed -i "s|\(Installation CD\)\(.*\)|\1 $(VER)|; s|CMDLINE|$(BOARD_KERNEL_CMDLINE)|" $</isolinux/isolinux.cfg
$(hide) sed -i "s|VER|$(VER)|; s|CMDLINE|$(BOARD_KERNEL_CMDLINE)|" $</efi/boot/android.cfg
Expand All @@ -193,7 +204,7 @@ $(ISO_IMAGE): $(boot_dir) $(BUILT_IMG)
which xorriso > /dev/null 2>&1 && GENISOIMG="xorriso -as mkisofs" || GENISOIMG=genisoimage; \
$$GENISOIMG -vJURT -b isolinux/isolinux.bin -c isolinux/boot.cat \
-no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -e boot/grub/efi.img -no-emul-boot \
-input-charset utf-8 -V "$(if $(RELEASE_OS_TITLE),$(RELEASE_OS_TITLE),Android-x86) ($(TARGET_ARCH))" -o $@ $^
-input-charset utf-8 -V "$(if $(RELEASE_OS_TITLE),$(RELEASE_OS_TITLE),Android-x86) $(VER) ($(TARGET_ARCH))" -o $@ $^
$(hide) PATH="/sbin:/usr/sbin:/bin:/usr/bin" isohybrid --uefi $@
$(hide) $(SHA256) $(ISO_IMAGE) | sed "s|$(PRODUCT_OUT)/||" > $(ISO_IMAGE).sha256
@echo -e ${CL_CYN}""${CL_CYN}
Expand All @@ -209,14 +220,16 @@ $(ISO_IMAGE): $(boot_dir) $(BUILT_IMG)
@echo -e ${CL_CYN}" \::/__/ \:\__\ \/__/ \::/ / \::/ / "${CL_CYN}
@echo -e ${CL_CYN}" ~~ \/__/ \/__/ \/__/ "${CL_CYN}
@echo -e ${CL_CYN}""${CL_CYN}
@echo -e ${CL_CYN}"===========-Bliss Package Complete-==========="${CL_RST}
@echo -e ${CL_CYN}"===========-$(RELEASE_OS_TITLE) Package Complete-==========="${CL_RST}
@echo -e ${CL_CYN}"Zip: "${CL_MAG} $(ISO_IMAGE)${CL_RST}
@echo -e ${CL_CYN}"SHA256: "${CL_MAG}" `cat $(ISO_IMAGE).sha256 | cut -d ' ' -f 1`"${CL_RST}
@echo -e ${CL_CYN}"Size:"${CL_MAG}" `ls -lah $(ISO_IMAGE) | cut -d ' ' -f 5`"${CL_RST}
@echo -e ${CL_CYN}"==============================================="${CL_RST}
@echo -e ${CL_CYN}"Have A Truly Blissful Experience"${CL_RST}
@echo -e ${CL_CYN}"==============================================="${CL_RST}
@echo -e ""
@echo -e "\n\n$@ is built successfully.\n\n"
@echo -e ""

rpm: $(wildcard $(LOCAL_PATH)/rpm/*) $(BUILT_IMG)
@echo ----- Making an rpm ------
Expand Down