diff options
| author | Florian Franzmann | 2020-07-25 16:51:29 +0200 |
|---|---|---|
| committer | Florian Franzmann | 2020-07-26 12:16:46 +0200 |
| commit | f83c38dcbe960dd2e4dea6f5f8d2ccfb0224accd (patch) | |
| tree | f768b664c41e2915917655b7fe435ddfe57b59b1 /doc | |
| parent | 1f89a1df44db4393e473db1d5ccaa270efe4c2bd (diff) | |
doc/man-pages: remove conflicting files
Diffstat (limited to 'doc')
| -rwxr-xr-x | doc/man-pages/DETAILS | 1 | ||||
| -rw-r--r-- | doc/man-pages/HISTORY | 4 | ||||
| -rwxr-xr-x | doc/man-pages/PRE_BUILD | 4 |
3 files changed, 8 insertions, 1 deletions
diff --git a/doc/man-pages/DETAILS b/doc/man-pages/DETAILS index 8a1a403f94..d317763c00 100755 --- a/doc/man-pages/DETAILS +++ b/doc/man-pages/DETAILS @@ -1,5 +1,6 @@ SPELL=man-pages VERSION=5.07 + PATCHLEVEL=1 SOURCE=$SPELL-$VERSION.tar.xz SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SOURCE_URL[0]=$KERNEL_URL/pub/linux/docs/man-pages/$SOURCE diff --git a/doc/man-pages/HISTORY b/doc/man-pages/HISTORY index f0f6710997..6505aa06f1 100644 --- a/doc/man-pages/HISTORY +++ b/doc/man-pages/HISTORY @@ -1,3 +1,7 @@ +2020-07-25 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * PRE_BUILD: remove getspnam.3 and passwd.5 which conflict with shadow + * DETAILS: PATCHLEVEL++ + 2020-06-11 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: version 5.07 diff --git a/doc/man-pages/PRE_BUILD b/doc/man-pages/PRE_BUILD index da4af625bf..5f48da8a0f 100755 --- a/doc/man-pages/PRE_BUILD +++ b/doc/man-pages/PRE_BUILD @@ -12,4 +12,6 @@ rm "${SOURCE_CACHE}/${SOURCE}" && SOURCE="${SOURCE}.xz" && -cd "${SOURCE_DIRECTORY}" +cd "${SOURCE_DIRECTORY}" && + +rm man3/getspnam.3 man5/passwd.5 |