Skip to content

Commit

Permalink
Rename recipes
Browse files Browse the repository at this point in the history 
base
|- <distro> -> archlinux, nixos: not versioned
|
|- <distro>-base
| |- <distro>-<version
|
|- debian-base -> debootstrap
| |- debian-<version>
| |- debian-<version>-<arch>
|
|- debian-base-netinstall -> variant with netinstall
| |- debian-<version>-netinstall
  • Loading branch information
@npf
npf committed Sep 21, 2016
1 parent 4a086ee commit 37b14d1
Show file tree
Hide file tree
Showing 22 changed files with 23 additions and 22 deletions.
2 changes: 1 addition & 1 deletion from_scratch/archlinux.yaml
View file
Expand Up @@ -6,7 +6,7 @@
#
#==============================================================================
---
extend: base-bootstrap.yaml
extend: base.yaml

# Global variables use by Kameleon engine and the steps
global:
Expand Down
0 from_scratch/base-bootstrap.yaml → from_scratch/base.yaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion from_scratch/centos-netinstall.yaml → from_scratch/centos-base.yaml
View file
Expand Up @@ -8,7 +8,7 @@
#
#==============================================================================
---
extend: base-bootstrap.yaml
extend: base.yaml
global:
distrib: centos
# release_major: 6
Expand Down
2 changes: 1 addition & 1 deletion from_scratch/centos6.yaml
View file
Expand Up @@ -6,7 +6,7 @@
#
#==============================================================================
---
extend: centos-netinstall.yaml
extend: centos-base.yaml
global:
release_major: 6
release_minor: 8
Expand Down
2 changes: 1 addition & 1 deletion from_scratch/centos7.yaml
View file
Expand Up @@ -6,7 +6,7 @@
#
#==============================================================================
---
extend: centos-netinstall.yaml
extend: centos-base.yaml

global:
# Distribution
Expand Down
2 changes: 1 addition & 1 deletion from_scratch/debian-netinstall.yaml → from_scratch/debian-base-netinstall.yaml
View file
Expand Up @@ -16,7 +16,7 @@
#
#==============================================================================
---
extend: base-bootstrap.yaml
extend: base.yaml

global:
# Boilerplate values, so that `kameleon info' works with the recipe.
Expand Down
2 changes: 1 addition & 1 deletion from_scratch/debian-debootstrap.yaml → from_scratch/debian-base.yaml
View file
Expand Up @@ -19,7 +19,7 @@
#
#==============================================================================
---
extend: base-bootstrap.yaml
extend: base.yaml

global:
distrib: debian
Expand Down
2 changes: 1 addition & 1 deletion from_scratch/debian-sid-arm64.yaml
View file
Expand Up @@ -7,7 +7,7 @@
#
#==============================================================================
---
extend: debian-debootstrap.yaml
extend: debian-base.yaml
global:
release: sid

Expand Down
2 changes: 1 addition & 1 deletion from_scratch/debian-sid.yaml
View file
Expand Up @@ -6,7 +6,7 @@
#
#==============================================================================
---
extend: debian-debootstrap.yaml
extend: debian-base.yaml

global:
release: sid
Expand Down
2 changes: 1 addition & 1 deletion from_scratch/debian-testing-arm64.yaml
View file
Expand Up @@ -7,7 +7,7 @@
#
#==============================================================================
---
extend: debian-debootstrap.yaml
extend: debian-base.yaml
global:
release: testing

Expand Down
2 changes: 1 addition & 1 deletion from_scratch/debian-testing.yaml
View file
Expand Up @@ -6,7 +6,7 @@
#
#==============================================================================
---
extend: debian-debootstrap.yaml
extend: debian-base.yaml

global:
release: testing
Expand Down
2 changes: 1 addition & 1 deletion from_scratch/debian7.yaml → from_scratch/debian7-netinstall.yaml
View file
Expand Up @@ -6,7 +6,7 @@
#
#==============================================================================
---
extend: debian-netinstall.yaml
extend: debian-base-netinstall.yaml
# Global variables use by Kameleon engine and the steps
global:
# Distribution
Expand Down
2 changes: 1 addition & 1 deletion from_scratch/debian8-arm64.yaml
View file
Expand Up @@ -7,7 +7,7 @@
#
#==============================================================================
---
extend: debian-debootstrap.yaml
extend: debian-base.yaml
global:
distrib: debian
release: jessie
Expand Down
5 changes: 3 additions & 2 deletions from_scratch/debian8.yaml → from_scratch/debian8-netinstall.yaml
View file
Expand Up @@ -6,9 +6,10 @@
#
#==============================================================================
---
extend: debian-netinstall.yaml

extend: debian-base-netinstall.yaml
# Global variables use by Kameleon engine and the steps
global:
# Distribution
distrib: debian
debian_arch: amd64
release: jessie
Expand Down
2 changes: 1 addition & 1 deletion from_scratch/fedora-base-bootstrap.yaml → from_scratch/fedora-base.yaml
View file
Expand Up @@ -7,7 +7,7 @@
# USAGE: Select the release
#==============================================================================
---
extend: centos-netinstall.yaml
extend: centos-base.yaml

global:
distrib: fedora
Expand Down
2 changes: 1 addition & 1 deletion from_scratch/fedora20.yaml
View file
Expand Up @@ -6,7 +6,7 @@
#
#==============================================================================
---
extend: fedora-base-bootstrap.yaml
extend: fedora-base.yaml

global:
release: 20
Expand Down
2 changes: 1 addition & 1 deletion from_scratch/fedora21.yaml
View file
Expand Up @@ -6,7 +6,7 @@
#
#==============================================================================
---
extend: fedora-base-bootstrap.yaml
extend: fedora-base.yaml

global:
release: 21
Expand Down
2 changes: 1 addition & 1 deletion from_scratch/fedora22.yaml
View file
Expand Up @@ -6,7 +6,7 @@
#
#==============================================================================
---
extend: fedora-base-bootstrap.yaml
extend: fedora-base.yaml

global:
release: 22
Expand Down
2 changes: 1 addition & 1 deletion from_scratch/fedora23.yaml
View file
Expand Up @@ -6,7 +6,7 @@
#
#==============================================================================
---
extend: fedora-base-bootstrap.yaml
extend: fedora-base.yaml

global:
release: 23
Expand Down
2 changes: 1 addition & 1 deletion from_scratch/ubuntu-base-bootstrap.yaml → from_scratch/ubuntu-base.yaml
View file
Expand Up @@ -6,7 +6,7 @@
#
#==============================================================================
---
extend: debian-debootstrap.yaml
extend: debian-base.yaml
# Global variables use by Kameleon engine and the steps
global:
# Distribution
Expand Down
2 changes: 1 addition & 1 deletion from_scratch/ubuntu12.04.yaml
View file
Expand Up @@ -6,7 +6,7 @@
#
#==============================================================================
---
extend: ubuntu-base-bootstrap.yaml
extend: ubuntu-base.yaml

global:
# Distribution
Expand Down
2 changes: 1 addition & 1 deletion from_scratch/ubuntu14.04.yaml
View file
Expand Up @@ -6,7 +6,7 @@
#
#==============================================================================
---
extend: ubuntu-base-bootstrap.yaml
extend: ubuntu-base.yaml

global:
release: trusty
Expand Down

0 comments on commit 37b14d1

Please sign in to comment.