scottk/OpenNetworkLinux
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenNetworkLinux.git synced 2025-12-25 17:27:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Version files moved.

Browse Source
This commit is contained in:
Jeffrey Townsend
2016-05-20 01:25:36 +00:00
parent dd93bf58bd
commit 9057eb80e2
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builds/amd64/installer/legacy/builds/Makefile
View File

@@ -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)

4
builds/any/installer/grub/builds/Makefile
View File

@@ -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)

4
builds/any/installer/legacy/fit/builds/Makefile
View File

@@ -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)

4
builds/any/installer/uboot/builds/Makefile
View File

@@ -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)

2
builds/any/rootfs/jessie/standard/standard.yml
View File

@@ -89,5 +89,5 @@ Configure:
password: onl
manifest:
version: $ONL/make/version-onl.json
version: $ONL/make/versions/version-onl.json
platforms: $PLATFORM_LIST

2
builds/any/rootfs/wheezy/standard/standard.yml
View File

@@ -91,5 +91,5 @@ Configure:
password: onl
manifest:
version: $ONL/make/version-onl.json
version: $ONL/make/versions/version-onl.json
platforms: $PLATFORM_LIST

8
packages/base/all/initrds/loader-initrd-files/PKG.yml
View File

@@ -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.,