Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
aports
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
650
Issues
650
List
Boards
Labels
Service Desk
Milestones
Merge Requests
216
Merge Requests
216
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alpine
aports
Commits
71b7a7a3
Commit
71b7a7a3
authored
Jun 06, 2011
by
Natanael Copa
2
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
main/alpine-conf: upgrade to 2.8.1
ref
#673
ref
#674
parent
85077a06
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
71 deletions
+3
-71
main/alpine-conf/0001-setup-apkrepos-avoid-double-in-url.patch
...alpine-conf/0001-setup-apkrepos-avoid-double-in-url.patch
+0
-27
main/alpine-conf/0002-setup-disk-add-raidmodules-to-etc-modules-if-needed.patch
...setup-disk-add-raidmodules-to-etc-modules-if-needed.patch
+0
-37
main/alpine-conf/APKBUILD
main/alpine-conf/APKBUILD
+3
-7
No files found.
main/alpine-conf/0001-setup-apkrepos-avoid-double-in-url.patch
deleted
100644 → 0
View file @
85077a06
From c23761a2c183f30c22a1811ba2e13b4c933f744f Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 3 May 2011 06:04:38 +0000
Subject: [PATCH 1/2] setup-apkrepos: avoid double // in url
---
setup-apkrepos.in | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/setup-apkrepos.in b/setup-apkrepos.in
index 21eb802..d4e8d80 100755
--- a/setup-apkrepos.in
+++ b/setup-apkrepos.in
@@ -102,8 +102,8 @@
get_alpine_release() {
add_mirror() {
local mirror="$1"
- echo "$mirror/$release/main" >> $APKREPOS_PATH
- echo "#$mirror/$release/testing" >> $APKREPOS_PATH
+ echo "${mirror%/}/${release}/main" >> $APKREPOS_PATH
+ echo "#${mirror%/}/${release}/testing" >> $APKREPOS_PATH
echo "" >> $APKREPOS_PATH
echo "Added mirror $(get_hostname_from_url $mirror)"
}
--
1.7.4.5
main/alpine-conf/0002-setup-disk-add-raidmodules-to-etc-modules-if-needed.patch
deleted
100644 → 0
View file @
85077a06
From 1a62591fa4176e9068e89f52194c4bac29e529a0 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 3 May 2011 08:34:01 +0000
Subject: [PATCH 2/2] setup-disk: add raidmodules to /etc/modules if needed
---
setup-disk.in | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/setup-disk.in b/setup-disk.in
index ffbbc43..b27f76b 100644
--- a/setup-disk.in
+++ b/setup-disk.in
@@ -564,12 +564,20 @@
setup_var() {
rmdir /.var
/etc/init.d/syslog --quiet restart
+ setup_mdadm_conf
}
setup_mdadm_conf() {
+ local mods= mod=
if [ -n "$USE_RAID" ]; then
mdadm --detail --scan > /etc/mdadm.conf
rc-update --quiet add mdadm-raid boot
+ mods=$(awk '/^raid/ {print $1}' /proc/modules)
+ for mod in $mods; do
+ if ! grep -q "^$mod" /etc/modules; then
+ echo $mod >> /etc/modules
+ fi
+ done
fi
}
--
1.7.4.5
main/alpine-conf/APKBUILD
View file @
71b7a7a3
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname
=
alpine-conf
pkgver
=
2.8.
0
pkgrel
=
1
pkgver
=
2.8.
1
pkgrel
=
0
pkgdesc
=
"Alpine configuration management scripts"
url
=
http://git.alpinelinux.org/cgit/
$pkgname
depends
=
"openrc"
source
=
"http://git.alpinelinux.org/cgit/
$pkgname
.git/snapshot/
$pkgname
-
$pkgver
.tar.bz2
0001-setup-apkrepos-avoid-double-in-url.patch
0002-setup-disk-add-raidmodules-to-etc-modules-if-needed.patch
"
arch
=
"all"
license
=
"GPL-2"
...
...
@@ -37,6 +35,4 @@ package() {
ln
-s
lbu
"
$pkgdir
"
/sbin/lbu_
$i
done
}
md5sums
=
"067f87974e78c895ec3a7404061c11d0 alpine-conf-2.8.0.tar.bz2
17cd6f91f68b4bbb1bc180dd17857e70 0001-setup-apkrepos-avoid-double-in-url.patch
1403684c448c416733544bc13c660e86 0002-setup-disk-add-raidmodules-to-etc-modules-if-needed.patch"
md5sums
=
"a8068da6ae47c1bc567ba215b0da6187 alpine-conf-2.8.1.tar.bz2"
iilluzion _
@iilluzion
mentioned in issue
#673 (closed)
·
Jul 12, 2019
mentioned in issue
#673 (closed)
mentioned in issue #673
Toggle commit list
Natanael Copa
@ncopa
mentioned in issue
#674 (closed)
·
Jul 12, 2019
mentioned in issue
#674 (closed)
mentioned in issue #674
Toggle commit list
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