diff options
| author | Simon Rettberg | 2016-02-01 10:57:40 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2016-02-01 10:57:40 +0100 |
| commit | ada949724588564fa7b6e6b33570ef19e5e4f611 (patch) | |
| tree | a61deed5bd03b19e29b5d7cf76bb41177687307f | |
| parent | [cron] Switch to cronie (diff) | |
| parent | [kernel-vanilla] Switch to 4.3.5 (diff) | |
| download | tm-scripts-ada949724588564fa7b6e6b33570ef19e5e4f611.tar.gz tm-scripts-ada949724588564fa7b6e6b33570ef19e5e4f611.tar.xz tm-scripts-ada949724588564fa7b6e6b33570ef19e5e4f611.zip | |
Merge branch 'master' of 10.4.9.56:/root/tm-scripts
| -rw-r--r-- | remote/modules/busybox/module.build | 1 | ||||
| -rw-r--r-- | remote/modules/kernel-vanilla/module.conf | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/remote/modules/busybox/module.build b/remote/modules/busybox/module.build index 73936e49..e3bd6de5 100644 --- a/remote/modules/busybox/module.build +++ b/remote/modules/busybox/module.build @@ -15,6 +15,7 @@ fetch_source() { build() { cp "openslx-busybox-config" "src/.config" cd src || perror "Could not cd to src" + yes '' | make oldconfig pinfo "Running make (if this hangs, check for unset options, ie. when you increased the REQUIRED_BRANCH)" make || perror "failed." pinfo "Running make install" diff --git a/remote/modules/kernel-vanilla/module.conf b/remote/modules/kernel-vanilla/module.conf index ea9ebc76..b615dc9b 100644 --- a/remote/modules/kernel-vanilla/module.conf +++ b/remote/modules/kernel-vanilla/module.conf @@ -1,5 +1,5 @@ REQUIRED_BINARIES="" REQUIRED_LIBRARIES="" REQUIRED_DIRECTORIES="" -REQUIRED_KERNEL="4.3.3" +REQUIRED_KERNEL="4.3.5" REQUIRED_GIT="git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git" |