Changeset 9b99ada
- Timestamp:
- 04/01/2022 08:26:17 AM (2 years ago)
- Branches:
- ablfs-more, trunk
- Children:
- 924a237
- Parents:
- 30a444a
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
Config.in
r30a444a r9b99ada 217 217 218 218 choice 219 prompt "BLFS Release" 220 default BLFS_GIT 221 222 config BLFS_GIT 223 bool "BLFS GIT" 224 help 225 Current development version as in trunk 219 prompt "BLFS book version" 220 default BLFS_BRANCH 221 222 config BLFS_BRANCH 223 bool "BLFS Branch (default trunk) or any commit" 224 help 225 Use a BLFS book downloaded from the git repository, and 226 checked out at any commit (branch/tag/sha). 226 227 227 228 config BLFS_WORKING_COPY 228 229 bool "BLFS working copy" 229 230 help 230 A local working copy of the BLFS book. 231 232 config BLFS_BRANCH 233 bool "BLFS Branch or stable book" 234 help 235 A supported GIT branch or stable (tag) book release 231 Use a local working copy of the BLFS book. 236 232 endchoice 237 233 … … 243 239 Full path to the BLFS book working copy 244 240 245 config BLFS_ BRANCH_ID246 string "BLFS Book Version (mandatory)"247 default "**EDIT ME**"241 config BLFS_COMMIT 242 string "BLFS Book commit (branch/tag/sha)" 243 default "trunk" 248 244 depends on BLFS_BRANCH 249 245 help … … 289 285 290 286 choice 291 prompt "LFS Release"292 default LFS_ relGIT287 prompt "LFS book version" 288 default LFS_BRANCH 293 289 depends on BOOK_BLFS 294 290 295 config LFS_relGIT 296 bool "LFS GIT" 297 help 298 Current development version as in trunk 291 config LFS_BRANCH 292 bool "LFS branch (default trunk) or any commit" 293 help 294 Use an LFS book downloaded from the git repository and 295 checked out at any commit (branch/tag/sha). 299 296 300 297 config LFS_WORKING_COPY 301 298 bool "LFS working copy" 302 299 help 303 A local working copy of the LFS book. 304 305 config LFS_BRANCH 306 bool "LFS Branch or stable book" 307 help 308 A supported GIT branch or stable (tag) book release 300 Use a local working copy of the LFS book. 309 301 endchoice 310 302 … … 316 308 Full path to the LFS book working copy" 317 309 318 config BLFS_LFS_ BRANCH_ID319 string "LFS Book Version(mandatory)"320 default "**EDIT ME**"310 config BLFS_LFS_COMMIT 311 string "LFS Book Commit (mandatory)" 312 default "trunk" 321 313 depends on LFS_BRANCH 322 314 help -
common/libs/func_install_blfs
r30a444a r9b99ada 54 54 REV=$INITSYS \ 55 55 LFS-BRANCH=${COMMIT} \ 56 BLFS-BRANCH=${BLFS_ TREE}\56 BLFS-BRANCH=${BLFS_COMMIT} \ 57 57 update 58 58 sudo make -j1 -C $BUILDDIR$BLFS_ROOT \ … … 62 62 LFS-BRANCH="${COMMIT}" \ 63 63 BLFS_XML=$BUILDDIR$BLFS_ROOT/$BLFS_XML \ 64 BLFS-BRANCH=${BLFS_ TREE}\64 BLFS-BRANCH=${BLFS_COMMIT} \ 65 65 $BUILDDIR$BLFS_ROOT/packages.xml 66 66 -
common/libs/func_validate_configs.sh
r30a444a r9b99ada 41 41 # Additional variables 42 42 local -r blfs_tool_PARAM_LIST="\ 43 BLFS_ TREE BLFS_BRANCH_IDBLFS_ROOT BLFS_XML TRACKING_DIR \43 BLFS_COMMIT BLFS_ROOT BLFS_XML TRACKING_DIR \ 44 44 DEP_LIBXML DEP_LIBXSLT DEP_DBXML DEP_LYNX DEP_SUDO DEP_WGET \ 45 45 DEP_GIT DEP_GPM" -
install-blfs-tools.sh
r30a444a r9b99ada 11 11 BLFS_ROOT : where the installed tools will be installed, relative to $HOME. 12 12 Must start with a '/' (default /blfs_root) 13 BLFS_ BRANCH_ID: development, branch-xxx, xxx (where xxx is a valid tag)14 (default development)15 LFS_ BRANCH_ID : development, branch-xxx, xxx (where xxx is a valid tag)16 (default development)13 BLFS_COMMIT : any commit (branch/tag/sha) 14 (default trunk) 15 LFS_COMMIT : any commit (branch/tag/sha) 16 (default trunk) 17 17 Examples: 18 18 1 - If you plan to use the tools to build BLFS on top of LFS, but you did not … … 68 68 if [ "$BOOK_BLFS" = y ]; then 69 69 ## Read variables and sanity checks 70 [[ "$relGIT" = y ]] && BLFS_BRANCH_ID=development 71 [[ "$BRANCH" = y ]] && BLFS_BRANCH_ID=$BRANCH_ID 70 [[ "$BRANCH" = y ]] && BLFS_COMMIT=$COMMIT 72 71 [[ "$WORKING_COPY" = y ]] && BLFS_BOOK=$BOOK 73 [[ "$BRANCH_ID" = "**EDIT ME**" ]] &&74 echo You have not set the BLFS book version or branch && exit 175 72 [[ "$BOOK" = "**EDIT ME**" ]] && 76 73 echo You have not set the BLFS working copy location && exit 1 77 [[ "$LFS_relGIT" = y ]] && LFS_BRANCH_ID=development 78 [[ "$LFS_BRANCH" = y ]] && LFS_BRANCH_ID=$BLFS_LFS_BRANCH_ID 74 [[ "$LFS_BRANCH" = y ]] && LFS_COMMIT=$BLFS_LFS_COMMIT 79 75 [[ "$LFS_WORKING_COPY" = y ]] && LFS_BOOK=$BLFS_LFS_BOOK 80 [[ "$LFS_BRANCH_ID" = "**EDIT ME**" ]] &&81 echo You have not set the LFS book version or branch && exit 182 76 [[ "$LFS_BOOK" = "**EDIT ME**" ]] && 83 77 echo You have not set the LFS working copy location && exit 1 … … 91 85 TRACKING_DIR="${TRACKING_DIR:=/var/lib/jhalfs/BLFS}" 92 86 INITSYS="${INITSYS:=sysv}" 93 BLFS_ BRANCH_ID=${BLFS_BRANCH_ID:=development}94 LFS_ BRANCH_ID=${LFS_BRANCH_ID:=development}87 BLFS_COMMIT=${BLFS_COMMIT:=trunk} 88 LFS_COMMIT=${LFS_COMMIT:=trunk} 95 89 BLFS_XML=${BLFS_XML:=blfs-xml} 96 90 LFS_XML=${LFS_XML:=lfs-xml} … … 101 95 PARAMS="$PARAMS WORKING_COPY BLFS_BOOK" 102 96 else 103 PARAMS="$PARAMS BLFS_ BRANCH_ID"97 PARAMS="$PARAMS BLFS_COMMIT" 104 98 fi 105 99 if [ "$LFS_WORKING_COPY" = y ]; then 106 100 PARAMS="$PARAMS LFS_WORKING_COPY LFS_BOOK" 107 101 else 108 PARAMS="$PARAMS LFS_ BRANCH_ID"102 PARAMS="$PARAMS LFS_COMMIT" 109 103 fi 110 104 # Format for displaying parameters: … … 131 125 132 126 [[ $VERBOSITY > 0 ]] && echo "${SD_BORDER}${nl_}" 133 134 case $BLFS_BRANCH_ID in135 development ) BLFS_TREE=trunk ;;136 branch-* ) BLFS_TREE=${BLFS_BRANCH_ID#branch-} ;;137 * ) BLFS_TREE=${BLFS_BRANCH_ID} ;;138 esac139 case $LFS_BRANCH_ID in140 development ) LFS_TREE=trunk ;;141 branch-* ) LFS_TREE=${LFS_BRANCH_ID#branch-} ;;142 * ) LFS_TREE=${LFS_BRANCH_ID} ;;143 esac144 127 145 128 # Check for build prerequisites. … … 194 177 REV=$INITSYS \ 195 178 LFS_XML=$BUILDDIR$BLFS_ROOT/$LFS_XML \ 196 LFS-GIT=git://git.linuxfromscratch.org/lfs.git \ 197 LFS-BRANCH=${LFS_TREE} \ 179 LFS-BRANCH=${LFS_COMMIT} \ 198 180 BLFS_XML=$BUILDDIR$BLFS_ROOT/$BLFS_XML \ 199 GIT=git://git.linuxfromscratch.org/blfs.git \ 200 BLFS-BRANCH=${BLFS_TREE} \ 181 BLFS-BRANCH=${BLFS_COMMIT} \ 201 182 $BUILDDIR$BLFS_ROOT/packages.xml 202 183 [[ $VERBOSITY > 0 ]] && echo "... OK" -
jhalfs
r30a444a r9b99ada 244 244 # check_blfs_tools 245 245 simple_message "${SD_BORDER}${nl_}" 246 BLFS_ GIT=${BLFS_GIT:-n}246 BLFS_BRANCH=${BLFS_BRANCH:-n} 247 247 BLFS_WORKING_COPY=${BLFS_WORKING_COPY:-n} 248 BLFS_BRANCH=${BLFS_BRANCH:-n} 249 if [[ "${BLFS_GIT}" = "y" ]]; then 250 BLFS_BRANCH_ID=development 251 BLFS_TREE=trunk 252 elif [[ "${BLFS_WORKING_COPY}" = "y" ]]; then 253 if [[ ! -d "$BLFS_WC_LOCATION/postlfs" ]] ; then 248 if [[ "${BLFS_WORKING_COPY}" = "y" ]] && 249 [[ ! -d "$BLFS_WC_LOCATION/postlfs" ]] ; then 254 250 echo " BLFS tools: This is not a working copy: $BLFS_WC_LOCATION." 255 251 echo " Please rerun make and fix the configuration." 256 252 exit 2 257 fi258 BLFS_TREE=$(cd $BLFS_WC_LOCATION; git branch --show-current)259 BLFS_BRANCH_ID=${BLFS_TREE/trunk/development}260 elif [[ "${BLFS_BRANCH}" = "y" ]] ; then261 case $BLFS_BRANCH_ID in262 *EDIT* ) echo " You forgot to set the BLFS branch or stable book version."263 echo " Please rerun make and fix the configuration."264 exit 2 ;;265 * ) BLFS_TREE=${BLFS_BRANCH_ID#branch-}266 esac267 253 fi 268 254 load_file "${COMMON_DIR}/libs/func_install_blfs"
Note:
See TracChangeset
for help on using the changeset viewer.