Updated to latest xe-solutions

Signed-off-by: James Ketrenos <james.p.ketrenos@intel.com>

assets/intel-gpu-info

@@ -215,24 +215,27 @@ devices+=(0x3EA4 "cfl_gt1" "Intel(R) UHD Graphics (Whiskey Lake 3x8 GT1)")
 devices+=(0x3EA0 "cfl_gt2" "Intel(R) UHD Graphics (Whiskey Lake 3x8 GT2)")
 devices+=(0x3EA3 "cfl_gt2" "Intel(R) UHD Graphics (Whiskey Lake 3x8 GT2)")
 devices+=(0x3EA2 "cfl_gt3" "Intel(R) UHD Graphics (Whiskey Lake 3x8 GT3)")
-devices+=(0x9B21 "cfl_gt1" "Intel(R) HD Graphics (Comet Lake 2x6 GT1)")
+devices+=(0x9B21 "cfl_gt1" "Intel(R) UHD Graphics (Comet Lake 2x6 GT1)")
-devices+=(0x9BA0 "cfl_gt1" "Intel(R) HD Graphics (Comet Lake 2x6 GT1)")
+devices+=(0x9BA0 "cfl_gt1" "Intel(R) UHD Graphics (Comet Lake 2x6 GT1)")
-devices+=(0x9BA2 "cfl_gt1" "Intel(R) HD Graphics (Comet Lake 2x6 GT1)")
+devices+=(0x9BA2 "cfl_gt1" "Intel(R) UHD Graphics (Comet Lake 2x6 GT1)")
-devices+=(0x9BA4 "cfl_gt1" "Intel(R) HD Graphics (Comet Lake 2x6 GT1)")
+devices+=(0x9BA4 "cfl_gt1" "Intel(R) UHD Graphics (Comet Lake 2x6 GT1)")
-devices+=(0x9BA5 "cfl_gt1" "Intel(R) HD Graphics (Comet Lake 2x6 GT1)")
+devices+=(0x9BA5 "cfl_gt1" "Intel(R) UHD Graphics (Comet Lake 2x6 GT1)")
-devices+=(0x9BA8 "cfl_gt1" "Intel(R) HD Graphics (Comet Lake 2x6 GT1)")
+devices+=(0x9BA8 "cfl_gt1" "Intel(R) UHD Graphics (Comet Lake 2x6 GT1)")
-devices+=(0x9BAA "cfl_gt1" "Intel(R) HD Graphics (Comet Lake 2x6 GT1)")
+devices+=(0x9BAA "cfl_gt1" "Intel(R) UHD Graphics (Comet Lake 2x6 GT1)")
-devices+=(0x9BAB "cfl_gt1" "Intel(R) HD Graphics (Comet Lake 2x6 GT1)")
+devices+=(0x9BAB "cfl_gt1" "Intel(R) UHD Graphics (Comet Lake 2x6 GT1)")
-devices+=(0x9BAC "cfl_gt1" "Intel(R) HD Graphics (Comet Lake 2x6 GT1)")
+devices+=(0x9BAC "cfl_gt1" "Intel(R) UHD Graphics (Comet Lake 2x6 GT1)")
-devices+=(0x9B41 "cfl_gt2" "Intel(R) HD Graphics (Comet Lake 3x8 GT2)")
+devices+=(0x9B41 "cfl_gt2" "Intel(R) UHD Graphics (Comet Lake 3x8 GT2)")
-devices+=(0x9BC0 "cfl_gt2" "Intel(R) HD Graphics (Comet Lake 3x8 GT2)")
+devices+=(0x9BC0 "cfl_gt2" "Intel(R) UHD Graphics (Comet Lake 3x8 GT2)")
-devices+=(0x9BC2 "cfl_gt2" "Intel(R) HD Graphics (Comet Lake 3x8 GT2)")
+devices+=(0x9BC2 "cfl_gt2" "Intel(R) UHD Graphics (Comet Lake 3x8 GT2)")
-devices+=(0x9BC4 "cfl_gt2" "Intel(R) HD Graphics (Comet Lake 3x8 GT2)")
+devices+=(0x9BC4 "cfl_gt2" "Intel(R) UHD Graphics (Comet Lake 3x8 GT2)")
-devices+=(0x9BC5 "cfl_gt2" "Intel(R) HD Graphics (Comet Lake 3x8 GT2)")
+devices+=(0x9BC5 "cfl_gt2" "Intel(R) UHD Graphics (Comet Lake 3x8 GT2)")
-devices+=(0x9BC8 "cfl_gt2" "Intel(R) HD Graphics (Comet Lake 3x8 GT2)")
+devices+=(0x9BC6 "cfl_gt2" "Intel(R) UHD Graphics (Comet Lake 3x8 GT2)")
-devices+=(0x9BCA "cfl_gt2" "Intel(R) HD Graphics (Comet Lake 3x8 GT2)")
+devices+=(0x9BC8 "cfl_gt2" "Intel(R) UHD Graphics (Comet Lake 3x8 GT2)")
-devices+=(0x9BCB "cfl_gt2" "Intel(R) HD Graphics (Comet Lake 3x8 GT2)")
+devices+=(0x9BCA "cfl_gt2" "Intel(R) UHD Graphics (Comet Lake 3x8 GT2)")
-devices+=(0x9BCC "cfl_gt2" "Intel(R) HD Graphics (Comet Lake 3x8 GT2)")
+devices+=(0x9BCB "cfl_gt2" "Intel(R) UHD Graphics (Comet Lake 3x8 GT2)")
+devices+=(0x9BCC "cfl_gt2" "Intel(R) UHD Graphics (Comet Lake 3x8 GT2)")
+devices+=(0x9BE6 "cfl_gt2" "Intel(R) UHD Graphics (Comet Lake 3x8 GT2)")
+devices+=(0x9BF6 "cfl_gt2" "Intel(R) UHD Graphics (Comet Lake 3x8 GT2)")
 devices+=(0x5A49 "cnl_2x8" "Intel(R) HD Graphics (Cannonlake 2x8 GT0.5)")
 devices+=(0x5A4A "cnl_2x8" "Intel(R) HD Graphics (Cannonlake 2x8 GT0.5)")
 devices+=(0x5A41 "cnl_3x8" "Intel(R) HD Graphics (Cannonlake 3x8 GT1)")
@@ -263,17 +266,15 @@ devices+=(0x4500 "ehl_4x8" "Intel(R) HD Graphics (Elkhart Lake 4x8)")
 devices+=(0x4571 "ehl_4x8" "Intel(R) HD Graphics (Elkhart Lake 4x8)")
 devices+=(0x4551 "ehl_4x4" "Intel(R) HD Graphics (Elkhart Lake 4x4)")
 devices+=(0x4541 "ehl_2x4" "Intel(R) HD Graphics (Elkhart Lake 2x4)")
+
 count=${#devices[*]}
 found=0
-intel_devices=($({
+intel_devices=($(
-find -L /sys/bus/pci/devices -maxdepth 2 -name vendor |
+for dir in /sys/bus/pci/devices/*; do
-  while read vendor; do
+  [[ -e "${dir}/vendor" ]] || continue
-    [[ "$(cat ${vendor})" == "0x8086" ]] && {
+  [[ "$(cat ${dir}/vendor)" == "0x8086" ]] &&
-      device=$(cat ${vendor/vendor/device})
+    echo "$(cat ${dir}/device)"
-      echo "${device}"
+done | sort -u))
-    }
-  done
-} | sort -u))
 
 for device in ${intel_devices[@]}; do
   index=0

scripts/build-dockerfile.sh

@@ -30,12 +30,19 @@ case "${OS_DISTRO}" in
       echo "Unrecognized OS_DISTRO: '${OS_DISTRO}'"
       exit -1
     }
-    [[ ! -e "Dockerfile.solution.${SOLUTION_SUFFIX}" ]] && {
-      SOLUTION_SUFFIX=""
-    }
     ;;
 esac
 
+[[ ! -e "Dockerfile.solution${SOLUTION_SUFFIX}" ]] && {
+  cat << EOF
+'${OS_DISTRO}' set as OS_DISTRO, but Dockerfile.solution${SOLUTION_SUFFIX} does not exist.
+
+Using Dockerfile.solution instead.
+EOF
+
+  SOLUTION_SUFFIX=""
+}
+
 export DOCKERFILE="Dockerfile${SOLUTION_SUFFIX}"
 export SOLUTION="Dockerfile.solution${SOLUTION_SUFFIX}"
 VARS+=("DOCKERFILE")

scripts/build-image.sh

@@ -16,9 +16,9 @@ export $(sed -nE "s,(^[^#][^=]*).*$,\1,pg" MANIFEST | ${CMD} -d '\n')
 
 RELEASE_INFO=${RELEASE_INFO:-N/A}
 [[ "${RELEASE_INFO}" == "N/A" ]] && {
-  TAG=${TAG:-test-build-${PACKAGE_STREAM}-$(date +%Y%m%d)}
+  TAG=${TAG:-test-build-${OS_DISTRO}-${PACKAGE_STREAM}-$(date +%Y%m%d)}
 } || {
-  TAG=${TAG:-test-${RELEASE_INFO}}
+  TAG=${TAG:-test-${OS_DISTRO}-${PACKAGE_STREAM}-${RELEASE_INFO}}
 }
 
 case "${OS_DISTRO}" in
@@ -40,6 +40,16 @@ case "${OS_DISTRO}" in
     ;;
 esac
 
+[[ ! -e "Dockerfile${SOLUTION_SUFFIX}" ]] && {
+  cat << EOF
+'${OS_DISTRO}' set as OS_DISTRO, but Dockerfile${SOLUTION_SUFFIX} does$
+
+Using Dockerfile instead.
+EOF
+
+  SOLUTION_SUFFIX=""
+}
+
 export DOCKERFILE="Dockerfile${SOLUTION_SUFFIX}"
 export SOLUTION="Dockerfile.solution${SOLUTION_SUFFIX}"
 

scripts/push-image.sh

@@ -16,9 +16,9 @@ export $(sed -nE "s,(^[^#][^=]*).*$,\1,pg" MANIFEST | ${CMD} -d '\n')
 
 RELEASE_INFO=${RELEASE_INFO:-N/A}
 [[ "${RELEASE_INFO}" == "N/A" ]] && {
-  TAG=${TAG:-test-build-${PACKAGE_STREAM}-$(date +%Y%m%d)}
+  TAG=${TAG:-test-build-${OS_DISTRO}-${PACKAGE_STREAM}-$(date +%Y%m%d)}
 } || {
-  TAG=${TAG:-test-${RELEASE_INFO}}
+  TAG=${TAG:-test-${OS_DISTRO}-${PACKAGE_STREAM}-${RELEASE_INFO}}
 }
 
 docker tag ${CONTAINER}:${TAG} ${REPO_URL}/${CONTAINER}:${TAG} \
@@ -49,8 +49,8 @@ If the image looks good, you can promote this build:
 
 3. Roll this version to the 'latest':
 
-  docker tag ${CONTAINER}:${TAG/test-} ${REGISTRY_URL}/${CONTAINER}:latest-${PACKAGE_STREAM}
+  docker tag ${CONTAINER}:${TAG/test-} ${REGISTRY_URL}/${CONTAINER}:latest-${OS_DISTRO}-${PACKAGE_STREAM}
-  docker push ${REGISTRY_URL}/${CONTAINER}:latest-${PACKAGE_STREAM}
+  docker push ${REGISTRY_URL}/${CONTAINER}:latest-${OS_DISTRO}-${PACKAGE_STREAM}
 
 EOM
 } || {

templates/centos/25-graphics-user.in

@@ -1,20 +0,0 @@
-# Create user 'user' and add them to 'sudo' for sudo access and set
-# the passwd to 'user'
-
-FROM xe-base-stage AS xe-user-stage
-
-RUN dnf install -y sudo
-
-# NOTE: Requires 'sudo' package to already be installed
-RUN groupadd -r user \
-  && useradd --no-log-init \
-    -s /bin/bash \
-    -r -m \
-    -g user \
-    -G sudo \
-    -p $(echo "user" | openssl passwd -stdin) user
-
-# Set 'sudo' to NOPASSWD for all container users
-RUN sed -i -e 's,%sudo.*,%sudo ALL=(ALL) NOPASSWD:ALL,g' /etc/sudoers
-
-USER user

templates/rhel/10-rhel-partner.in

@@ -1,3 +1,6 @@
+# Remove any pre-configured repositories
+RUN rm -rf /etc/yum.repos.d/*
+
 # Install the Red Hat partner repositories
 RUN { \
   echo "[RHEL-8-appstream-partners]" ; \

templates/rhel/25-graphics-user.in

@@ -1,20 +0,0 @@
-# Create user 'user' and add them to 'sudo' for sudo access and set
-# the passwd to 'user'
-
-FROM xe-base-stage AS xe-user-stage
-
-RUN dnf install -y sudo
-
-# NOTE: Requires 'sudo' package to already be installed
-RUN groupadd -r user \
-  && useradd --no-log-init \
-    -s /bin/bash \
-    -r -m \
-    -g user \
-    -G sudo \
-    -p $(echo "user" | openssl passwd -stdin) user
-
-# Set 'sudo' to NOPASSWD for all container users
-RUN sed -i -e 's,%sudo.*,%sudo ALL=(ALL) NOPASSWD:ALL,g' /etc/sudoers
-
-USER user