From 9057eb80e25c5b6cf8a2c4479c65f084101e3cb8 Mon Sep 17 00:00:00 2001 From: Jeffrey Townsend Date: Fri, 20 May 2016 01:25:36 +0000 Subject: [PATCH] Version files moved. --- builds/amd64/installer/legacy/builds/Makefile | 4 ++-- builds/any/installer/grub/builds/Makefile | 4 ++-- builds/any/installer/legacy/fit/builds/Makefile | 4 ++-- builds/any/installer/uboot/builds/Makefile | 4 ++-- builds/any/rootfs/jessie/standard/standard.yml | 2 +- builds/any/rootfs/wheezy/standard/standard.yml | 2 +- packages/base/all/initrds/loader-initrd-files/PKG.yml | 8 ++++---- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/builds/amd64/installer/legacy/builds/Makefile b/builds/amd64/installer/legacy/builds/Makefile index c32b3bce..e5c06989 100644 --- a/builds/amd64/installer/legacy/builds/Makefile +++ b/builds/amd64/installer/legacy/builds/Makefile @@ -13,7 +13,7 @@ MKSHAR_PERMS = autoperms.sh # Hardcoded to match ONL File naming conventions. -include $(ONL)/make/version-onl.mk +include $(ONL)/make/versions/version-onl.mk INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_LEGACY_INSTALLER @@ -28,7 +28,7 @@ __installer: mv ./usr/share/onl/packages/amd64/onl-swi/*.swi . rm -rf ./usr $(ONL_V_at)cp /dev/null $(MKSHAR_PERMS) - $(ONL_V_at) cp $(ONL)/make/version-onl.sh . + $(ONL_V_at) cp $(ONL)/make/versions/version-onl.sh . $(ONL_V_at)echo "#!/bin/sh" >> $(MKSHAR_PERMS) $(ONL_V_at)echo "set -e" >> $(MKSHAR_PERMS) $(ONL_V_at)echo "set -x" >> $(MKSHAR_PERMS) diff --git a/builds/any/installer/grub/builds/Makefile b/builds/any/installer/grub/builds/Makefile index 99be574f..2d1e55a6 100644 --- a/builds/any/installer/grub/builds/Makefile +++ b/builds/any/installer/grub/builds/Makefile @@ -10,7 +10,7 @@ MKSHAR_OPTS = --lazy --unzip-pad --fixup-perms autoperms.sh MKSHAR_PERMS = autoperms.sh # Hardcoded to match ONL File naming conventions. -include $(ONL)/make/version-onl.mk +include $(ONL)/make/versions/version-onl.mk INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_INSTALLER ifeq ($(ARCH), amd64) @@ -36,7 +36,7 @@ __installer: __installer_platform_files __installer_swi_files >> installer.sh $(ONL_V_at)echo "PAYLOAD_FOLLOWS" >> installer.sh $(ONL_V_at)cp /dev/null $(MKSHAR_PERMS) - $(ONL_V_at)cp $(ONL)/make/version-onl.sh . + $(ONL_V_at)cp $(ONL)/make/versions/version-onl.sh . $(ONL_V_at)echo "#!/bin/sh" >> $(MKSHAR_PERMS) $(ONL_V_at)echo "set -e" >> $(MKSHAR_PERMS) $(ONL_V_at)echo "set -x" >> $(MKSHAR_PERMS) diff --git a/builds/any/installer/legacy/fit/builds/Makefile b/builds/any/installer/legacy/fit/builds/Makefile index ce7e1c65..7052ebab 100644 --- a/builds/any/installer/legacy/fit/builds/Makefile +++ b/builds/any/installer/legacy/fit/builds/Makefile @@ -5,7 +5,7 @@ endif THISDIR := $(dir $(lastword $(MAKEFILE_LIST))) # Hardcoded to match ONL File naming conventions. -include $(ONL)/make/version-onl.mk +include $(ONL)/make/versions/version-onl.mk INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_LEGACY_INSTALLER FIT_IMAGE_ALL := $(shell $(ONLPM) --find-file onl-loader-fit:$(ARCH) onl-loader-fit.itb) @@ -28,7 +28,7 @@ ifndef NO_SWI endif rm -rf ./usr $(ONL_V_at)cp /dev/null $(MKSHAR_PERMS) - $(ONL_V_at) cp $(ONL)/make/version-onl.sh . + $(ONL_V_at) cp $(ONL)/make/versions/version-onl.sh . $(ONL_V_at)echo "#!/bin/sh" >> $(MKSHAR_PERMS) $(ONL_V_at)echo "set -e" >> $(MKSHAR_PERMS) $(ONL_V_at)echo "set -x" >> $(MKSHAR_PERMS) diff --git a/builds/any/installer/uboot/builds/Makefile b/builds/any/installer/uboot/builds/Makefile index ea5ad357..eae9c217 100644 --- a/builds/any/installer/uboot/builds/Makefile +++ b/builds/any/installer/uboot/builds/Makefile @@ -14,7 +14,7 @@ PYFIT = $(VONLDIR)/src/bin/pyfit PYFIT_ENVIRONMENT = PYTHONPATH=$(VONLDIR)/src/python # Hardcoded to match ONL File naming conventions. -include $(ONL)/make/version-onl.mk +include $(ONL)/make/versions/version-onl.mk INSTALLER_NAME=$(FNAME_PRODUCT_VERSION)_ONL-OS_$(FNAME_BUILD_ID)_$(UARCH)_INSTALLER # default fit image can be used as the canonical location for the initrd @@ -25,7 +25,7 @@ INITRD_BOUNDS := $(shell $(PYFIT_ENVIRONMENT) $(PYFIT) -v offset $(FIT_IMAGE_ALL __installer: installer.sh __installer_fit_files __installer_platform_files __installer_swi_files $(ONL_V_at)rm -rf *INSTALLER* *.md5sum $(ONL_V_at)cp /dev/null $(MKSHAR_PERMS) - $(ONL_V_at)cp $(ONL)/make/version-onl.sh . + $(ONL_V_at)cp $(ONL)/make/versions/version-onl.sh . $(ONL_V_at)echo "#!/bin/sh" >> $(MKSHAR_PERMS) $(ONL_V_at)echo "set -e" >> $(MKSHAR_PERMS) $(ONL_V_at)echo "set -x" >> $(MKSHAR_PERMS) diff --git a/builds/any/rootfs/jessie/standard/standard.yml b/builds/any/rootfs/jessie/standard/standard.yml index 7266fa7d..c3b22d8e 100644 --- a/builds/any/rootfs/jessie/standard/standard.yml +++ b/builds/any/rootfs/jessie/standard/standard.yml @@ -89,5 +89,5 @@ Configure: password: onl manifest: - version: $ONL/make/version-onl.json + version: $ONL/make/versions/version-onl.json platforms: $PLATFORM_LIST diff --git a/builds/any/rootfs/wheezy/standard/standard.yml b/builds/any/rootfs/wheezy/standard/standard.yml index f7f04c32..1ba7a3d4 100644 --- a/builds/any/rootfs/wheezy/standard/standard.yml +++ b/builds/any/rootfs/wheezy/standard/standard.yml @@ -91,5 +91,5 @@ Configure: password: onl manifest: - version: $ONL/make/version-onl.json + version: $ONL/make/versions/version-onl.json platforms: $PLATFORM_LIST diff --git a/packages/base/all/initrds/loader-initrd-files/PKG.yml b/packages/base/all/initrds/loader-initrd-files/PKG.yml index 3ae21ef7..09237084 100644 --- a/packages/base/all/initrds/loader-initrd-files/PKG.yml +++ b/packages/base/all/initrds/loader-initrd-files/PKG.yml @@ -15,10 +15,10 @@ packages: - src/lib : /lib - src/bootmodes : /bootmodes - src/python: /usr/lib/python2.7/site-packages - - $ONL/make/version-onl.sh : /etc/onl/loader/versions.sh - - $ONL/make/version-onl.json : /etc/onl/loader/versions.json - - $ONL/make/version-onl.mk : /etc/onl/loader/versions.mk - + - $ONL/make/versions/version-onl.sh : /etc/onl/loader/versions.sh + - $ONL/make/versions/version-onl.json : /etc/onl/loader/versions.json + - $ONL/make/versions/version-onl.mk : /etc/onl/loader/versions.mk + changelog: Change changes changes.,