1
0
Эх сурвалжийг харах

Move submodules to root directory

Fabian Mastenbroek 4 жил өмнө
parent
commit
032fd5e72c
7 өөрчлөгдсөн 13 нэмэгдсэн , 12 устгасан
  1. 5 4
      .gitmodules
  2. 3 3
      Makefile
  3. 1 1
      README.md
  4. 0 0
      linux
  5. 2 2
      scripts/update.sh
  6. 2 2
      scripts/version.sh
  7. 0 0
      zfs

+ 5 - 4
.gitmodules

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

+ 3 - 3
Makefile

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

+ 1 - 1
README.md

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

+ 0 - 0
submodules/ubuntu-mainline → linux


+ 2 - 2
scripts/update.sh

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

+ 2 - 2
scripts/version.sh

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

+ 0 - 0
submodules/zfsonlinux → zfs