Skip to content

Commit

Permalink
Move submodules to root directory
Browse files Browse the repository at this point in the history
  • Loading branch information
fabianishere committed Mar 28, 2021
1 parent 6ead8d7 commit 032fd5e
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 12 deletions.
9 changes: 5 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[submodule "submodules/zfsonlinux"]
path = submodules/zfsonlinux
[submodule "zfs"]
path = zfs
url = git://git.proxmox.com/git/zfsonlinux.git

[submodule "submodules/ubuntu-mainline"]
path = submodules/ubuntu-mainline
[submodule "linux"]
path = linux
url = git://git.launchpad.net/~ubuntu-kernel-test/ubuntu/+source/linux/+git/mainline-crack
shallow = true
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ GITVERSION:=$(shell git rev-parse HEAD)

BUILD_DIR=build

KERNEL_SRC=ubuntu-mainline
KERNEL_SRC_SUBMODULE=submodules/$(KERNEL_SRC)
KERNEL_SRC=linux
KERNEL_SRC_SUBMODULE=$(KERNEL_SRC)
KERNEL_CFG_ORG=config-${KERNEL_VER}.org

ZFSONLINUX_SUBMODULE=submodules/zfsonlinux/
ZFSONLINUX_SUBMODULE=zfs/
ZFSDIR=pkg-zfs

MODULES=modules
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ apt install ./dwarves_1.17-1_amd64.deb
```bash
git clone https://github.com/fabianishere/pve-edge-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
```
Afterwards, select the branch of your likings (e.g. `v5.8.x`).
Expand Down
Submodule linux updated from 000000 to af39f8
4 changes: 2 additions & 2 deletions scripts/update.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/bin/bash
# Script to prepare update for new kernel release
set -e
set -e
set -o pipefail

LINUX_REPOSITORY=submodules/ubuntu-mainline
LINUX_REPOSITORY=linux

while getopts "R:t:b:v:r:h" OPTION; do
case $OPTION in
Expand Down
4 changes: 2 additions & 2 deletions scripts/version.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/bin/bash
# Script for parsing version information in the repository
set -e
set -e
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_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)
Expand Down
Submodule zfs updated from 000000 to 363c00

0 comments on commit 032fd5e

Please sign in to comment.