Move submodules to root directory

This commit is contained in:
Fabian Mastenbroek 2021-03-15 20:34:24 +01:00
parent 6ead8d7e6f
commit 032fd5e72c
No known key found for this signature in database
GPG key ID: 405FC6F81F0A7B85
7 changed files with 13 additions and 12 deletions

9
.gitmodules vendored
View file

@ -1,7 +1,8 @@
[submodule "submodules/zfsonlinux"] [submodule "zfs"]
path = submodules/zfsonlinux path = zfs
url = git://git.proxmox.com/git/zfsonlinux.git url = git://git.proxmox.com/git/zfsonlinux.git
[submodule "submodules/ubuntu-mainline"] [submodule "linux"]
path = submodules/ubuntu-mainline path = linux
url = git://git.launchpad.net/~ubuntu-kernel-test/ubuntu/+source/linux/+git/mainline-crack url = git://git.launchpad.net/~ubuntu-kernel-test/ubuntu/+source/linux/+git/mainline-crack
shallow = true

View file

@ -45,11 +45,11 @@ GITVERSION:=$(shell git rev-parse HEAD)
BUILD_DIR=build BUILD_DIR=build
KERNEL_SRC=ubuntu-mainline KERNEL_SRC=linux
KERNEL_SRC_SUBMODULE=submodules/$(KERNEL_SRC) KERNEL_SRC_SUBMODULE=$(KERNEL_SRC)
KERNEL_CFG_ORG=config-${KERNEL_VER}.org KERNEL_CFG_ORG=config-${KERNEL_VER}.org
ZFSONLINUX_SUBMODULE=submodules/zfsonlinux/ ZFSONLINUX_SUBMODULE=zfs/
ZFSDIR=pkg-zfs ZFSDIR=pkg-zfs
MODULES=modules MODULES=modules

View file

@ -67,7 +67,7 @@ apt install ./dwarves_1.17-1_amd64.deb
```bash ```bash
git clone https://github.com/fabianishere/pve-edge-kernel git clone https://github.com/fabianishere/pve-edge-kernel
cd pve-ede-kernel cd pve-ede-kernel
git submodule update --init --depth=1 --recursive submodules/ubuntu-mainline git submodule update --init --depth=1 --recursive linux
git submodule update --init --recursive git submodule update --init --recursive
``` ```
Afterwards, select the branch of your likings (e.g. `v5.8.x`). Afterwards, select the branch of your likings (e.g. `v5.8.x`).

View file

@ -1,9 +1,9 @@
#!/bin/bash #!/bin/bash
# Script to prepare update for new kernel release # Script to prepare update for new kernel release
set -e set -e
set -o pipefail set -o pipefail
LINUX_REPOSITORY=submodules/ubuntu-mainline LINUX_REPOSITORY=linux
while getopts "R:t:b:v:r:h" OPTION; do while getopts "R:t:b:v:r:h" OPTION; do
case $OPTION in case $OPTION in

View file

@ -1,9 +1,9 @@
#!/bin/bash #!/bin/bash
# Script for parsing version information in the repository # Script for parsing version information in the repository
set -e set -e
set -o pipefail set -o pipefail
LINUX_REPOSITORY=submodules/ubuntu-mainline LINUX_REPOSITORY=linux
LINUX_VERSION_MAJOR=$(sed -n "s/^KERNEL_MAJ=\([0-9]*$\)/\1/p" < Makefile | xargs) LINUX_VERSION_MAJOR=$(sed -n "s/^KERNEL_MAJ=\([0-9]*$\)/\1/p" < Makefile | xargs)
LINUX_VERSION_MINOR=$(sed -n "s/^KERNEL_MIN=\([0-9]*$\)/\1/p" < Makefile | xargs) LINUX_VERSION_MINOR=$(sed -n "s/^KERNEL_MIN=\([0-9]*$\)/\1/p" < Makefile | xargs)
LINUX_VERSION_PATCHLEVEL=$(sed -n "s/^KERNEL_PATCHLEVEL=\([0-9]*$\)/\1/p" < Makefile | xargs) LINUX_VERSION_PATCHLEVEL=$(sed -n "s/^KERNEL_PATCHLEVEL=\([0-9]*$\)/\1/p" < Makefile | xargs)