Commit: 60b284b8d86b47f4f9208dbf50688d9bf11c9d78 - bootable-newinstaller (git)

bootable/newinstaller

Commit MetaInfo

• Révision: 60b284b8d86b47f4f9208dbf50688d9bf11c9d78 (tree)
• l'heure: 2018-02-06 19:32:47
• Auteur: Chih-Wei Huang <cwhuang@linu...>
• Commiter: Chih-Wei Huang

Message de Log

Set rpm epoch

Set epoch to the major version for a non-rc (stable) release.
Otherwise, set epoch to the major version minus one.

Change Summary

• modified: Android.mk
• modified: rpm/rpm.spec

Modification

--- a/Android.mk
+++ b/Android.mk
@@ -92,8 +92,9 @@ $(ISO_IMAGE): $(boot_dir) $(BUILT_IMG)
 rpm: $(wildcard $(LOCAL_PATH)/rpm/*) $(BUILT_IMG)
 	@echo ----- Making an rpm ------
 	OUT=$(abspath $(PRODUCT_OUT)); mkdir -p $$OUT/rpm/BUILD; rm -rf $$OUT/rpm/RPMS/*; $(ACP) $< $$OUT; \
+	echo $(VER) | grep -vq rc; EPOCH=$$((-$$? + `echo $(VER) | cut -d. -f1`)); \
 	rpmbuild -bb --target=$(if $(filter x86,$(TARGET_ARCH)),i686,x86_64) -D"cmdline $(BOARD_KERNEL_CMDLINE)" \
-		-D"_topdir $$OUT/rpm" -D"_sourcedir $$OUT" -D"systemimg $(notdir $(systemimg))" -D"ver $(VER)" \
+		-D"_topdir $$OUT/rpm" -D"_sourcedir $$OUT" -D"systemimg $(notdir $(systemimg))" -D"ver $(VER)" -D"epoch $$EPOCH" \
 		$(if $(BUILD_NAME_VARIANT),-D"name $(BUILD_NAME_VARIANT)") \
 		-D"install_prefix $(if $(INSTALL_PREFIX),$(INSTALL_PREFIX),android-$(VER))" $(filter %.spec,$^); \
 	mv $$OUT/rpm/RPMS/*/*.rpm $$OUT

--- a/rpm/rpm.spec
+++ b/rpm/rpm.spec
@@ -2,6 +2,7 @@ Summary: %{?title}%{!?title:Android-x86} - Run Android on your PC
 Name: %{?name}%{!?name:android-x86}
 Version: %(echo %{ver} | cut -d- -f1)
 Release: %(echo %{ver} | cut -d- -f2)
+Epoch: %{epoch}
 Source1: kernel
 Source2: initrd.img
 Source3: ramdisk.img