Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 89035b0

Browse files
committed
Fix for Fedora and CentOS bootstap (close #646) and added Fedora 25 (close #683)
1 parent 6f94be4 commit 89035b0

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

‎cli.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
################################################################################
88

9-
VERSION="2.1.3"
9+
VERSION="2.1.4"
1010

1111
################################################################################
1212
# Common

‎include/bootstrap/centos/deploy.sh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,14 @@ do_install()
8686
msg "Retrieving base packages: "
8787
local package i pkg_url pkg_file pkg_arch
8888
case "${ARCH}" in
89-
i386) pkg_arch="\(i686\|noarch\)" ;;
90-
x86_64) pkg_arch="\(x86_64\|noarch\)" ;;
91-
armhfp) pkg_arch="\(armv7hl\|noarch\)" ;;
92-
aarch64) pkg_arch="\(aarch64\|noarch\)" ;;
89+
i386) pkg_arch="-e i686 -e noarch" ;;
90+
x86_64) pkg_arch="-e x86_64 -e noarch" ;;
91+
armhfp) pkg_arch="-e armv7hl -e noarch" ;;
92+
aarch64) pkg_arch="-e aarch64 -e noarch" ;;
9393
esac
9494
for package in ${basic_packages}; do
9595
msg -n "${package} ... "
96-
pkg_url=$(grep -m1 -e "^.*/${package}-[0-9][0-9\.\-].*${pkg_arch}\.rpm$" "${pkg_list}")
96+
pkg_url=$(grep -e "^.*/${package}-[0-9][0-9\.\-].*rpm$" "${pkg_list}"| grep -m1 ${pkg_arch})
9797
test "${pkg_url}"; is_ok "skip" || continue
9898
pkg_file="${pkg_url##*/}"
9999
# download
@@ -110,8 +110,8 @@ do_install()
110110

111111
component_exec core/emulator
112112

113-
msg -n "Updating a packages database ... "
114-
chroot_exec /bin/rpm -iv --excludepath / --force --nosignature --nodeps --justdb /tmp/*.rpm>/dev/null
113+
msg -n "Installing base packages ... "
114+
chroot_exec /bin/rpm -i --force --nosignature --nodeps /tmp/*.rpm
115115
is_ok "fail" "done" || return 1
116116

117117
msg -n "Clearing cache ... "

‎include/bootstrap/fedora/deploy.sh‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Linux Deploy Component
33
# (c) Anton Skshidlevsky <meefik@gmail.com>, GPLv3
44

5-
[ -n "${SUITE}" ] || SUITE="24"
5+
[ -n "${SUITE}" ] || SUITE="25"
66

77
if [ -z "${ARCH}" ]
88
then
@@ -51,7 +51,7 @@ do_install()
5151

5252
msg ":: Installing ${COMPONENT} ... "
5353

54-
local basic_packages="filesystem audit-libs basesystem bash bash-completion bzip2-libs ca-certificates chkconfig coreutils cpio cracklib cracklib-dicts crypto-policies cryptsetup-libs curl cyrus-sasl-lib dbus dbus-libs deltarpm diffutils dnf dnf-conf elfutils-libelf elfutils-libs expat fedora-release fedora-repos file-libs fipscheck fipscheck-lib gamin gawk gdbm glib2 glibc glibc-common gmp gnupg2 gnutls gpgme grep gzip hawkey hwdata info keyutils-libs kmod kmod-libs krb5-libs libacl libarchive libassuan libattr libblkid libcap libcap-ng libcom_err libcomps libcurl libdb libdb-utils libdb4 libffi libgcc libgcrypt libgpg-error libidn libmetalink libmicrohttpd libmount libnghttp2 libpipeline libpsl libpwquality librepo libreport-filesystem libseccomp libselinux libselinux-utils libsemanage libsepol libsmartcols libsolv libssh2 libstdc++ libtasn1 libunistring libuser libutempter libuuid libverto libxml2 lua lz4 lzo man-db man-pages ncurses ncurses-base ncurses-libs nettle nspr nss nss-softokn nss-softokn-freebl nss-sysinit nss-tools nss-util openldap openssl-libs p11-kit p11-kit-trust pam pcre pinentry pkgconfig policycoreutils popt pth pygpgme pyliblzma python python-chardet python-kitchen python-libs python-pycurl python-six python-urlgrabber python3 python3-dnf python3-hawkey python3-iniparse python3-libcomps python3-librepo python3-libs python3-pip python3-pygpgme python3-setuptools python3-six pyxattr qrencode-libs readline rootfiles rpm rpm-build-libs rpm-libs rpm-plugin-selinux rpm-plugin-systemd-inhibit rpm-python rpm-python3 sed selinux-policy setup shadow-utils shared-mime-info sqlite sqlite-libs sudo system-python-libs systemd systemd-libs tcp_wrappers-libs trousers tzdata ustr util-linux vim-minimal which xz-libs zlib"
54+
local basic_packages="filesystem audit-libs basesystem bash bash-completion bzip2-libs ca-certificates chkconfig coreutils cpio cracklib cracklib-dicts crypto-policies cryptsetup-libs curl cyrus-sasl-lib dbus dbus-libs deltarpm diffutils dnf dnf-conf elfutils-libelf elfutils-libs expat fedora-release fedora-repos file-libs fipscheck fipscheck-lib gamin gawk gdbm glib2 glibc glibc-common gmp gnupg2 gnutls gpgme grep gzip hawkey hwdata info keyutils-libs kmod kmod-libs krb5-libs libacl libarchive libassuan libattr libblkid libcap libcap-ng libcom_err libcomps libcrypt libcurl libdb libdb-utils libdb4 libffi libgcc libgcrypt libgpg-error libidn libmetalink libmicrohttpd libmount libnghttp2 libpipeline libpsl libpwquality librepo libreport-filesystem libseccomp libselinux libselinux-utils libsemanage libsepol libsmartcols libsolv libssh2 libstdc++ libtasn1 libunistring libuser libutempter libuuid libverto libxml2 lua lua-libs lz4 lzo man-db man-pages ncurses ncurses-base ncurses-libs nettle nspr nss nss-softokn nss-softokn-freebl nss-sysinit nss-tools nss-util openldap openssl-libs p11-kit p11-kit-trust pam pcre pinentry pkgconfig policycoreutils popt pth pygpgme pyliblzma python python-chardet python-kitchen python-libs python-pycurl python-six python-urlgrabber python3 python3-dnf python3-hawkey python3-iniparse python3-libcomps python3-librepo python3-libs python3-pip python3-pygpgme python3-rpm python3-setuptools python3-six pyxattr qrencode-libs readline rootfiles rpm rpm-build-libs rpm-libs rpm-plugin-selinux rpm-plugin-systemd-inhibit rpm-python rpm-python3 sed selinux-policy setup shadow-utils shared-mime-info sqlite sqlite-libs sudo system-python system-python-libs systemd systemd-libs tcp_wrappers-libs trousers tzdata ustr util-linux vim-minimal which xz-libs zlib"
5555

5656
if [ "${ARCH}" = "aarch64" ]
5757
then local repo_url="${SOURCE_PATH%/}/fedora-secondary/releases/${SUITE}/Everything/${ARCH}/os"
@@ -76,14 +76,14 @@ do_install()
7676
msg "Retrieving base packages: "
7777
local package i pkg_url pkg_file pkg_arch
7878
case "${ARCH}" in
79-
i386) pkg_arch="\(i686\|noarch\)" ;;
80-
x86_64) pkg_arch="\(x86_64\|noarch\)" ;;
81-
armhfp) pkg_arch="\(armv7hl\|noarch\)" ;;
82-
aarch64) pkg_arch="\(aarch64\|noarch\)" ;;
79+
i386) pkg_arch="-e i686 -e noarch" ;;
80+
x86_64) pkg_arch="-e x86_64 -e noarch" ;;
81+
armhfp) pkg_arch="-e armv7hl -e noarch" ;;
82+
aarch64) pkg_arch="-e aarch64 -e noarch" ;;
8383
esac
8484
for package in ${basic_packages}; do
8585
msg -n "${package} ... "
86-
pkg_url=$(grep -m1 -e "^.*/${package}-[0-9r][0-9\.\-].*${pkg_arch}\.rpm$" "${pkg_list}")
86+
pkg_url=$(grep -e "^.*/${package}-[0-9r][0-9\.\-].*rpm$" "${pkg_list}"| grep -m1 ${pkg_arch})
8787
test "${pkg_url}"; is_ok "skip" || continue
8888
pkg_file="${pkg_url##*/}"
8989
# download
@@ -100,8 +100,8 @@ do_install()
100100

101101
component_exec core/emulator
102102

103-
msg -n "Updating a packages database ... "
104-
chroot_exec /bin/rpm -iv --excludepath / --force --nosignature --nodeps --justdb /tmp/*.rpm>/dev/null
103+
msg -n "Installing base packages ... "
104+
chroot_exec /bin/rpm -i --force --nosignature --nodeps /tmp/*.rpm
105105
is_ok "fail" "done" || return 1
106106

107107
msg -n "Clearing cache ... "

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /