summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2018-11-07 09:53:28 -0500
committerJason Woodward2018-11-07 09:53:28 -0500
commitab2b470b115e8a554c2c8cecb95f0f51a7e61455 (patch)
treeb19cc5b27ebcbc9b364d593cf5b8c55461699960
parent775669f1dcc52581c552cb0805c33f3ba9e2af62 (diff)
downloadslapt-get-ab2b470b115e8a554c2c8cecb95f0f51a7e61455.tar.gz
remove aaa_elflibs from exclude list, add aaa_base to dist upgrade required packages
-rw-r--r--default.slapt-getrc.aarch642
-rw-r--r--default.slapt-getrc.arm2
-rw-r--r--default.slapt-getrc.i3862
-rw-r--r--default.slapt-getrc.x86_642
-rw-r--r--example.slapt-getrc2
-rw-r--r--example.slapt-getrc.i3862
-rw-r--r--example.slapt-getrc.x86_642
-rw-r--r--src/action.c2
-rw-r--r--t/data/rc12
9 files changed, 9 insertions, 9 deletions
diff --git a/default.slapt-getrc.aarch64 b/default.slapt-getrc.aarch64
index c5ab02a..309742d 100644
--- a/default.slapt-getrc.aarch64
+++ b/default.slapt-getrc.aarch64
@@ -4,7 +4,7 @@ WORKINGDIR=/var/cache/slapt-get
# Exclude package names and expressions.
# To exclude pre and beta packages, add this to the exclude:
# [0-9\_\.\-]{1}pre[0-9\-\.\-]{1}
-EXCLUDE=^aaa_elflibs,^devs,^glibc-.*,^kernel-.*,^udev,.*-[0-9]+dl$,x86_64,i[3456]86,arm
+EXCLUDE=^devs,^glibc-.*,^kernel-.*,^udev,.*-[0-9]+dl$,x86_64,i[3456]86,arm
# Base url to directory with a PACKAGES.TXT.
# This can point to any release, ie: 9.0, 10.0, current, etc.
diff --git a/default.slapt-getrc.arm b/default.slapt-getrc.arm
index a11413a..e433fa9 100644
--- a/default.slapt-getrc.arm
+++ b/default.slapt-getrc.arm
@@ -4,7 +4,7 @@ WORKINGDIR=/var/cache/slapt-get
# Exclude package names and expressions.
# To exclude pre and beta packages, add this to the exclude:
# [0-9\_\.\-]{1}pre[0-9\-\.\-]{1}
-EXCLUDE=^aaa_elflibs,^devs,^glibc-.*,^kernel-.*,^udev,.*-[0-9]+dl$,x86_64,i[3456]86
+EXCLUDE=^devs,^glibc-.*,^kernel-.*,^udev,.*-[0-9]+dl$,x86_64,i[3456]86
# Base url to directory with a PACKAGES.TXT.
# This can point to any release, ie: 9.0, 10.0, current, etc.
diff --git a/default.slapt-getrc.i386 b/default.slapt-getrc.i386
index 7ea425f..884bc6d 100644
--- a/default.slapt-getrc.i386
+++ b/default.slapt-getrc.i386
@@ -4,7 +4,7 @@ WORKINGDIR=/var/cache/slapt-get
# Exclude package names and expressions.
# To exclude pre and beta packages, add this to the exclude:
# [0-9\_\.\-]{1}pre[0-9\-\.\-]{1}
-EXCLUDE=^aaa_elflibs,^devs,^glibc-.*,^kernel-.*,^udev,.*-[0-9]+dl$,x86_64
+EXCLUDE=^devs,^glibc-.*,^kernel-.*,^udev,.*-[0-9]+dl$,x86_64
# Base url to directory with a PACKAGES.TXT.
# This can point to any release, ie: 9.0, 10.0, current, etc.
diff --git a/default.slapt-getrc.x86_64 b/default.slapt-getrc.x86_64
index eac291c..c034ab9 100644
--- a/default.slapt-getrc.x86_64
+++ b/default.slapt-getrc.x86_64
@@ -4,7 +4,7 @@ WORKINGDIR=/var/cache/slapt-get
# Exclude package names and expressions.
# To exclude pre and beta packages, add this to the exclude:
# [0-9\_\.\-]{1}pre[0-9\-\.\-]{1}
-EXCLUDE=^aaa_elflibs,^devs,^glibc-.*,^kernel-.*,^udev,.*-[0-9]+dl$,i[3456]86
+EXCLUDE=^devs,^glibc-.*,^kernel-.*,^udev,.*-[0-9]+dl$,i[3456]86
# Base url to directory with a PACKAGES.TXT.
# This can point to any release, ie: 9.0, 10.0, current, etc.
diff --git a/example.slapt-getrc b/example.slapt-getrc
index a3849ab..086de69 100644
--- a/example.slapt-getrc
+++ b/example.slapt-getrc
@@ -3,7 +3,7 @@ WORKINGDIR=/var/cache/slapt-get
# exclude package names and expressions
-EXCLUDE=^kernel-.*,^glibc.*,.*-[0-9]+dl$,^devs$,^udev$,aaa_elflibs,x86_64
+EXCLUDE=^kernel-.*,^glibc.*,.*-[0-9]+dl$,^devs$,^udev$,x86_64
# * to exclude pre and beta packages, add this as an exclude:
# [0-9\_\.\-]{1}pre[0-9\-\.\-]{1}
# To exclude architectures such as i686, use the following:
diff --git a/example.slapt-getrc.i386 b/example.slapt-getrc.i386
index 83ead8a..3d6014c 100644
--- a/example.slapt-getrc.i386
+++ b/example.slapt-getrc.i386
@@ -4,7 +4,7 @@ WORKINGDIR=/var/cache/slapt-get
# Exclude package names and expressions.
# To exclude pre and beta packages, add this to the exclude:
# [0-9\_\.\-]{1}pre[0-9\-\.\-]{1}
-EXCLUDE=^aaa_elflibs,^devs,^glibc-.*,^kernel-.*,^udev,.*-[0-9]+dl$,x86_64
+EXCLUDE=^devs,^glibc-.*,^kernel-.*,^udev,.*-[0-9]+dl$,x86_64
# Slackware64 mirrors to choose from.
# Please use one of these in preference to ftp.slackware.com
diff --git a/example.slapt-getrc.x86_64 b/example.slapt-getrc.x86_64
index d3bafcb..3255260 100644
--- a/example.slapt-getrc.x86_64
+++ b/example.slapt-getrc.x86_64
@@ -4,7 +4,7 @@ WORKINGDIR=/var/cache/slapt-get
# Exclude package names and expressions.
# To exclude pre and beta packages, add this to the exclude:
# [0-9\_\.\-]{1}pre[0-9\-\.\-]{1}
-EXCLUDE=^aaa_elflibs,^devs,^glibc-.*,^kernel-.*,^udev,.*-[0-9]+dl$,i[3456]86
+EXCLUDE=^devs,^glibc-.*,^kernel-.*,^udev,.*-[0-9]+dl$,i[3456]86
# Slackware64 mirrors to choose from.
# Please use one of these in preference to ftp.slackware.com
diff --git a/src/action.c b/src/action.c
index eea7daa..ecfe291 100644
--- a/src/action.c
+++ b/src/action.c
@@ -478,7 +478,7 @@ void slapt_pkg_action_upgrade_all(const slapt_rc_config *global_config)
tran = slapt_init_transaction();
if (global_config->dist_upgrade) {
- char *essential[] = {"pkgtools", "glibc-solibs", "glibc", "aaa_elflibs", "xz", "sed", "tar", "gzip", NULL};
+ char *essential[] = {"aaa_base", "pkgtools", "glibc-solibs", "glibc", "aaa_elflibs", "xz", "sed", "tar", "gzip", NULL};
int epi = 0;
slapt_pkg_info_t *newest_slaptget = NULL;
slapt_pkg_list_t *matches =
diff --git a/t/data/rc1 b/t/data/rc1
index df0a18c..d8a829b 100644
--- a/t/data/rc1
+++ b/t/data/rc1
@@ -1,3 +1,3 @@
WORKINGDIR=data/slapt-get
-EXCLUDE=^kernel-.*,^alsa-.*,.*-[0-9]+dl$,^devs$,^udev$,aaa_elflibs
+EXCLUDE=^kernel-.*,^alsa-.*,.*-[0-9]+dl$,^devs$,^udev$
SOURCE=http://software.jaos.org/slackpacks/13.37/