diff options
| author | Simon Rettberg | 2014-07-04 14:46:20 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2014-07-04 14:46:20 +0200 |
| commit | d1f5aedd76df437a08f3283fa00bc8a9dab7fa2b (patch) | |
| tree | 8c046eeaf8e874b479b95964b2bf410365cff438 /remote/modules/kernel | |
| parent | remove hardcoded /bin/rm call. Relative calls work in services files (diff) | |
| download | tm-scripts-d1f5aedd76df437a08f3283fa00bc8a9dab7fa2b.tar.gz tm-scripts-d1f5aedd76df437a08f3283fa00bc8a9dab7fa2b.tar.xz tm-scripts-d1f5aedd76df437a08f3283fa00bc8a9dab7fa2b.zip | |
"Fedora Support", step 1 ->
Several changes:
1) Make sure /bin /sbin /lib and /lib64 are ALWAYS symlinks to /usr/XXX,
no matter what the current distribution does.
2) Make sure nobody and nogroup exist.
3) Fix various modules making assumptions that are not true on every
distro.
4) Add symlinks to kdm module since fedora is looking for kdmrc in
yet another spot.
5) Add detection of fedora, support its package manager
What still breaks: dnbd3
Other distros might not work now, they need adaption to changed logic
in some modules.
Diffstat (limited to 'remote/modules/kernel')
| m--------- | remote/modules/kernel/aufs3-standalone | 0 | ||||
| l--------- | remote/modules/kernel/kernel-system | 1 | ||||
| -rw-r--r-- | remote/modules/kernel/module.build | 4 | ||||
| -rw-r--r-- | remote/modules/kernel/module.conf.fedora | 3 | ||||
| -rw-r--r-- | remote/modules/kernel/module.conf.opensuse | 5 |
5 files changed, 9 insertions, 4 deletions
diff --git a/remote/modules/kernel/aufs3-standalone b/remote/modules/kernel/aufs3-standalone new file mode 160000 +Subproject 0b4a532fc19edd562b3417914dd1346f96ea482 diff --git a/remote/modules/kernel/kernel-system b/remote/modules/kernel/kernel-system new file mode 120000 index 00000000..041dc99f --- /dev/null +++ b/remote/modules/kernel/kernel-system @@ -0,0 +1 @@ +../../modules/kernel-system
\ No newline at end of file diff --git a/remote/modules/kernel/module.build b/remote/modules/kernel/module.build index 979ce742..9270024d 100644 --- a/remote/modules/kernel/module.build +++ b/remote/modules/kernel/module.build @@ -1,6 +1,6 @@ get_kernel_version() { # determine kernel version that will be running in the generated system - if [ -e "$MODULES_DIR/kernel/ksrc/include/generated/utsrelease.h" ]; then + if [ -e "$MODULES_DIR/kernel/ksrc/include/generated/utsrelease.h" ]; then # declare kernel version stuff declare -rg SYS_UTS_RELEASE=$(grep 'UTS_RELEASE' "$MODULES_DIR/kernel/ksrc/include/generated/utsrelease.h" | awk -F '"' '{print $2}') declare -rg SYS_KERNEL=$(echo "$SYS_UTS_RELEASE" | grep -o -E '^[0-9\.]+') @@ -23,7 +23,7 @@ get_kernel_version() { fetch_source() { pdebug "getting kernel sources via git ...." [ -d ./ksrc ] && rm -rf ./ksrc # slightly brutal ... - git clone --depth 1 ${REQUIRED_GIT} ksrc || perror "Could not clone kernel git." + git clone --depth 1 "${REQUIRED_GIT}" -b "${REQUIRED_GIT_BRANCH}" ksrc || perror "Could not clone kernel git." # check for aufs local RSL=$(find ksrc/ -type d -name aufs) if [ -z "$RSL" ]; then diff --git a/remote/modules/kernel/module.conf.fedora b/remote/modules/kernel/module.conf.fedora new file mode 100644 index 00000000..53e6ccb6 --- /dev/null +++ b/remote/modules/kernel/module.conf.fedora @@ -0,0 +1,3 @@ +REQUIRED_GIT_BRANCH="v${SYSTEM_KERNEL_SHORT}" +REQUIRED_GIT="git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git" + diff --git a/remote/modules/kernel/module.conf.opensuse b/remote/modules/kernel/module.conf.opensuse index a66564fe..cdf57cc7 100644 --- a/remote/modules/kernel/module.conf.opensuse +++ b/remote/modules/kernel/module.conf.opensuse @@ -1,2 +1,3 @@ -REQUIRED_GIT_BRANCH="-b openSUSE-${SYS_VERSION}" -REQUIRED_GIT="git://kernel.opensuse.org/kernel.git $REQUIRED_GIT_BRANCH" +REQUIRED_GIT_BRANCH="openSUSE-${SYS_VERSION}" +REQUIRED_GIT="git://kernel.opensuse.org/kernel.git" + |