Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
etersoft-build-utils
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
korinf
etersoft-build-utils
Commits
8ba480ec
Commit
8ba480ec
authored
Mar 24, 2021
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
s/regexp_exclude/reg_exclude/
parent
5ee84b35
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
aptU
bin/aptU
+1
-1
rpmreqs
bin/rpmreqs
+4
-4
No files found.
bin/aptU
View file @
8ba480ec
...
@@ -71,7 +71,7 @@ install_packages()
...
@@ -71,7 +71,7 @@ install_packages()
docmd
$SUDO
apt-get
install
$LIST
docmd
$SUDO
apt-get
install
$LIST
ALREADYHANDLEDAPT
=
"
$ALREADYHANDLEDAPT
$LIST
"
ALREADYHANDLEDAPT
=
"
$ALREADYHANDLEDAPT
$LIST
"
REQLIST
=
"
$(
$ETERBUILDBIN
/rpmreqs
$LIST
)
"
REQLIST
=
"
$(
$ETERBUILDBIN
/rpmreqs
$LIST
)
"
REQLIST
=
$(
estrlist reg
exp
_exclude
"
$ALREADYHANDLEDRPM
"
"
$REQLIST
"
)
REQLIST
=
$(
estrlist reg_exclude
"
$ALREADYHANDLEDRPM
"
"
$REQLIST
"
)
test
-n
"
$REQLIST
"
||
{
echog
"There is no more req packages to install"
;
return
;
}
test
-n
"
$REQLIST
"
||
{
echog
"There is no more req packages to install"
;
return
;
}
install_by_requires
$REQLIST
install_by_requires
$REQLIST
...
...
bin/rpmreqs
View file @
8ba480ec
...
@@ -69,9 +69,9 @@ trans_rpmdeps_to_pkgname_ldv()
...
@@ -69,9 +69,9 @@ trans_rpmdeps_to_pkgname_ldv()
local
ALREADYHANDLEDRPM
=
"rpmlib.* rtld libgcc_s
\.
.* libstdc
\+\+
.* libc
\.
so.* ld-linux
\.
so.* libpthread
\.
so.* librt
\.
so.*"
local
ALREADYHANDLEDRPM
=
"rpmlib.* rtld libgcc_s
\.
.* libstdc
\+\+
.* libc
\.
so.* ld-linux
\.
so.* libpthread
\.
so.* librt
\.
so.*"
local
REQLIST
=
"
$@
"
local
REQLIST
=
"
$@
"
REQLIST
=
$(
estrlist reg
exp
_exclude
"
$ALREADYHANDLEDRPM
"
"
$REQLIST
"
)
REQLIST
=
$(
estrlist reg_exclude
"
$ALREADYHANDLEDRPM
"
"
$REQLIST
"
)
REALPKGNAMELIST
=
$(
estrlist reg
exp
_exclude
". /*"
"
$REQLIST
"
)
REALPKGNAMELIST
=
$(
estrlist reg_exclude
". /*"
"
$REQLIST
"
)
REQCONVLIST
=
$(
estrlist exclude
"
$REALPKGNAMELIST
"
"
$REQLIST
"
)
REQCONVLIST
=
$(
estrlist exclude
"
$REALPKGNAMELIST
"
"
$REQLIST
"
)
set_hasherdir
set_hasherdir
...
@@ -117,7 +117,7 @@ common-licenses
...
@@ -117,7 +117,7 @@ common-licenses
librpmbuild
librpmbuild
passwdqc-control"
passwdqc-control"
REQLIST
=
$(
estrlist union
$(
convert_pkgfile_to_pkgname
$PKGFILES
)
$REALPKGNAMELIST
)
REQLIST
=
$(
estrlist union
$(
convert_pkgfile_to_pkgname
$PKGFILES
)
$REALPKGNAMELIST
)
REQLIST
=
$(
estrlist reg
exp
_exclude
"
$ALREADYHANDLEDRPM
"
"
$REQLIST
"
)
REQLIST
=
$(
estrlist reg_exclude
"
$ALREADYHANDLEDRPM
"
"
$REQLIST
"
)
estrlist union
$REQLIST
estrlist union
$REQLIST
}
}
...
@@ -142,7 +142,7 @@ trans_rpmdeps_to_pkgname_lav()
...
@@ -142,7 +142,7 @@ trans_rpmdeps_to_pkgname_lav()
# partially copied from aptU
# partially copied from aptU
#VIRTREQ=$(LANG=C apt-get install --print-uris $REQLIST 2>&1 | grep "is a virtual package provided by" | cut -f2 -d" " | sort -u)
#VIRTREQ=$(LANG=C apt-get install --print-uris $REQLIST 2>&1 | grep "is a virtual package provided by" | cut -f2 -d" " | sort -u)
#FIXME: f.i., we got /usr/bin/lpstat in VIRTREQ (select cups or lprng package?). Skip now
#FIXME: f.i., we got /usr/bin/lpstat in VIRTREQ (select cups or lprng package?). Skip now
#REQLIST=$(estrlist reg
exp
_exclude "VIRTREQ" "$REQLIST")
#REQLIST=$(estrlist reg_exclude "VIRTREQ" "$REQLIST")
# TODO: we have store_output function
# TODO: we have store_output function
TFILE
=
$(
make_temp_file
)
TFILE
=
$(
make_temp_file
)
PKGFILES
=
PKGFILES
=
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment