@@ -6,9 +6,9 @@ The repository is based on the upstream Linux kernel tree. All branches except m
...
@@ -6,9 +6,9 @@ The repository is based on the upstream Linux kernel tree. All branches except m
The master branch tracks [Linus's master branch](git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git)(i.e."mainline").
The master branch tracks [Linus's master branch](git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git)(i.e."mainline").
### internal
### os-build
The internal branch is used for the kernel configuration and build scripts. When new configuration options are needed or the build requirements change, this is the branch to send merge requests to. When a new release is made, this branch is merged into the release branch. Configuration and build scripts can be found in the ``redhat/`` directory. Refer to the Configuration section below for more details.
The os-build branch is used for the kernel configuration and build scripts. When new configuration options are needed or the build requirements change, this is the branch to send merge requests to. When a new release is made, this branch is merged into the release branch. Configuration and build scripts can be found in the ``redhat/`` directory. Refer to the Configuration section below for more details.
### ark-latest
### ark-latest
...
@@ -56,7 +56,7 @@ The tags come in two varieties. The first is kernel builds based off an upstream
...
@@ -56,7 +56,7 @@ The tags come in two varieties. The first is kernel builds based off an upstream
## Configuration
## Configuration
The configuration layout is somewhat complicated. All configuration is located on the `internal` branch in `redhat/configs/`. Inside this directory there are a number of scripts used to automatically generate complete configurations, along with a number of directories that contain configuration snippets. At this time, there are three main configuration directories: `ark`, `common`, and `fedora`. `ark` and `fedora` are configuration "flavors", while `common` is shared configuration across flavors.
The configuration layout is somewhat complicated. All configuration is located on the `os-build` branch in `redhat/configs/`. Inside this directory there are a number of scripts used to automatically generate complete configurations, along with a number of directories that contain configuration snippets. At this time, there are three main configuration directories: `ark`, `common`, and `fedora`. `ark` and `fedora` are configuration "flavors", while `common` is shared configuration across flavors.
