diff --git a/base/lvm2/lvm2.conf b/base/lvm2/lvm2.conf index 884139372..dd0e25e74 100644 --- a/base/lvm2/lvm2.conf +++ b/base/lvm2/lvm2.conf @@ -1,8 +1,8 @@ -#!/bin/sh -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../lvm2/lvm2.conf +# Filename: package/.../lvm2/lvm2.conf +# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -11,29 +11,32 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the # GNU General Public License can be found in the file COPYING. -# --- T2-COPYRIGHT-NOTE-END --- -prefix='' +# --- SDE-COPYRIGHT-NOTE-END --- + +prefix= set_confopt if [ "$SDECFG_STATIC" == 1 ]; then var_append patchfiles ' ' "$confdir/no_dynamic.diff" var_append confopt ' ' '--enable-static_link=yes' - - # let it read lvm1 format metadata (via device-mapper) - var_append extraconfopt ' ' '--with-lvm1=internal' -else - var_append extraconfopt ' ' '--with-lvm1=shared' fi # if there is no device-mapper, lvm2 tools fallback to $0.lvm1 if pkginstalled linux24; then var_append extraconfopt ' ' '--enable-lvm1_fallback' -fi -if ! atstage native; then - autogen=1 + if [ "$SDECFG_STATIC" == 1 ]; then + # let it read lvm1 format metadata (via device-mapper) + var_append extraconfopt ' ' '--with-lvm1=internal' + else + var_append extraconfopt ' ' '--with-lvm1=shared' + fi +else + var_append extraconfopt ' ' '--with-lvm1=none' fi +atstage native || autogen=1 + # our STRIP definition makes conflict with this package which defined STRIP # as an argument for `install` -var_remove_regex makeinstopt ' ' 'STRIP=.*' +export STRIP=