Changeset 2758d94 for LFS/master.sh
- Timestamp:
- 04/11/2019 07:40:50 AM (5 years ago)
- Branches:
- ablfs-more, legacy, trunk
- Children:
- 0e4ddfa
- Parents:
- adbd09b
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
LFS/master.sh
radbd09b r2758d94 117 117 # 118 118 # Find the name of the tarball and the version of the package 119 pkg_tarball=$( get_package_tarball_name $name)120 pkg_version=$( get_package_version $pkg_tarball)119 pkg_tarball=$(sed -n 's/tar -xf \(.*\)/\1/p' $file) 120 pkg_version=$(sed -n 's/VERSION=\(.*\)/\1/p' $file) 121 121 122 122 # Drop in the name of the target on a new line, and the previous target … … 126 126 # If $pkg_tarball isn't empty, we've got a package... 127 127 if [ "$pkg_tarball" != "" ] ; then 128 # Insert instructions for unpacking the package and to set the PKGDIR variable.129 LUSER_wrt_unpack "$pkg_tarball"130 128 # Always initialize the log file, since the test instructions may be 131 129 # "uncommented" by the user … … 146 144 *) LUSER_wrt_RunAsUser "$file" "$pkg_version" ;; 147 145 esac 148 149 # Remove the build directory(ies) except if the package build fails150 # (so we can review config.cache, config.log, etc.)151 if [ "$pkg_tarball" != "" ] ; then152 case "${name}" in153 *xz-utils) LUSER_RemoveBuildDirs "xz" ;;154 *) LUSER_RemoveBuildDirs "$name" ;;155 esac156 fi157 146 158 147 # Include a touch of the target name so make can check … … 217 206 # Find the tarball corresponding to our script. 218 207 # If it doesn't, we skip it in iterations rebuilds (except stripping). 219 pkg_tarball=$( get_package_tarball_name $name)220 pkg_version=$( get_package_version $pkg_tarball)208 pkg_tarball=$(sed -n 's/tar -xf \(.*\)/\1/p' $file) 209 pkg_version=$(sed -n 's/VERSION=\(.*\)/\1/p' $file) 221 210 222 211 if [[ "$pkg_tarball" = "" ]] && [[ -n "$N" ]] ; then … … 256 245 CHROOT_wrt_TouchTimestamp 257 246 fi 258 CHROOT_Unpack "$pkg_tarball"259 247 # Always initialize the log file, so that the use may reinstate a 260 248 # commented out test … … 274 262 # except if the package build fails. 275 263 if [ "$pkg_tarball" != "" ] ; then 276 case "${name}" in277 *xz-utils) CHROOT_wrt_RemoveBuildDirs "xz" ;;278 *) CHROOT_wrt_RemoveBuildDirs "$name" ;;279 esac280 264 if [ "${INSTALL_LOG}" = "y" ] && [ "x${N}" = "x" ] ; then 281 265 CHROOT_wrt_LogNewFiles "$name" … … 337 321 *bootscripts) 338 322 name="lfs-bootscripts" 339 pkg_tarball=$(get_package_tarball_name $name)340 323 if [ "${INSTALL_LOG}" = "y" ] ; then 341 324 CHROOT_wrt_TouchTimestamp 342 325 fi 343 CHROOT_Unpack "$pkg_tarball"344 326 ;; 345 327 *network-scripts) 346 328 name="lfs-network-scripts" 347 pkg_tarball=$(get_package_tarball_name $name)348 329 if [ "${INSTALL_LOG}" = "y" ] ; then 349 330 CHROOT_wrt_TouchTimestamp 350 331 fi 351 CHROOT_Unpack "$pkg_tarball"352 332 ;; 353 333 *kernel) 354 334 name="linux" 355 pkg_tarball=$(get_package_tarball_name $name)356 335 if [ "${INSTALL_LOG}" = "y" ] ; then 357 336 CHROOT_wrt_TouchTimestamp 358 337 fi 359 CHROOT_Unpack "$pkg_tarball"360 338 # If using optimizations, use MAKEFLAGS (unless blacklisted) 361 339 # no setting of CFLAGS and friends. … … 377 355 378 356 case "${this_script}" in 379 *bootscripts ) CHROOT_wrt_RemoveBuildDirs "dummy"357 *bootscripts|*network-scripts|*kernel) 380 358 if [ "${INSTALL_LOG}" = "y" ] ; then 381 359 CHROOT_wrt_LogNewFiles "$name" 382 360 fi ;; 383 *network-scripts) CHROOT_wrt_RemoveBuildDirs "dummy" 384 if [ "${INSTALL_LOG}" = "y" ] ; then 385 CHROOT_wrt_LogNewFiles "$name" 386 fi ;; 387 *kernel) CHROOT_wrt_RemoveBuildDirs "dummy" 388 if [ "${INSTALL_LOG}" = "y" ] ; then 389 CHROOT_wrt_LogNewFiles "$name" 390 fi ;; 391 esac 392 361 esac 393 362 # Include a touch of the target name so make can check 394 363 # if it's already been made.
Note:
See TracChangeset
for help on using the changeset viewer.