Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
mkinitcpio
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pkg
obcore
mkinitcpio
Commits
5dacc26b
Commit
5dacc26b
authored
4 years ago
by
Eric Vidal
Browse files
Options
Downloads
Patches
Plain Diff
upgpkg: 28-2
parent
51fbf079
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
version/28-2/0003-remove-systemd.patch
+59
-0
59 additions, 0 deletions
version/28-2/0003-remove-systemd.patch
version/28-2/PKGBUILD
+95
-0
95 additions, 0 deletions
version/28-2/PKGBUILD
version/28-2/mkinitcpio.install
+15
-0
15 additions, 0 deletions
version/28-2/mkinitcpio.install
with
169 additions
and
0 deletions
version/28-2/0003-remove-systemd.patch
0 → 100644
+
59
−
0
View file @
5dacc26b
diff -Nuar -uar a/Makefile b/Makefile
--- a/Makefile 2019-10-30 00:40:58.000000000 +1100
+++ b/Makefile 2019-11-02 18:24:50.000000000 +1100
@@ -17,7 +17,6 @@
/usr/share/man/man5 \
/usr/share/man/man1 \
/usr/share/mkinitcpio \
- /usr/lib/systemd/system/shutdown.target.wants \
/usr/lib/tmpfiles.d \
/usr/share/libalpm/hooks \
/usr/share/libalpm/scripts
@@ -57,10 +56,6 @@
cp -at $(DESTDIR)/usr/lib/initcpio hooks install
install -m644 -t $(DESTDIR)/usr/share/mkinitcpio mkinitcpio.d/*
- install -m644 systemd/mkinitcpio-generate-shutdown-ramfs.service \
- $(DESTDIR)/usr/lib/systemd/system/mkinitcpio-generate-shutdown-ramfs.service
- ln -s ../mkinitcpio-generate-shutdown-ramfs.service \
- $(DESTDIR)/usr/lib/systemd/system/shutdown.target.wants/mkinitcpio-generate-shutdown-ramfs.service
install -m644 tmpfiles/mkinitcpio.conf $(DESTDIR)/usr/lib/tmpfiles.d/mkinitcpio.conf
install -m755 50-mkinitcpio.install $(DESTDIR)/usr/lib/kernel/install.d/50-mkinitcpio.install
diff -Nuar -uar a/PKGBUILD b/PKGBUILD
--- a/PKGBUILD 2019-10-30 00:40:58.000000000 +1100
+++ b/PKGBUILD 2019-11-02 18:25:15.000000000 +1100
@@ -9,7 +9,7 @@
conflicts=('mkinitcpio')
provides=("mkinitcpio=$pkgver" "initramfs")
depends=('mkinitcpio-busybox>=1.19.4-2' 'kmod' 'util-linux>=2.23' 'libarchive' 'coreutils'
- 'awk' 'bash' 'findutils' 'grep' 'filesystem>=2011.10-1' 'systemd' 'gzip')
+ 'awk' 'bash' 'findutils' 'grep' 'filesystem>=2011.10-1' 'gzip')
makedepends=('asciidoc' 'git' 'sed')
optdepends=('xz: Use lzma or xz compression for the initramfs image'
'bzip2: Use bzip2 compression for the initramfs image'
diff -Nuar -uar a/init_functions b/init_functions
--- a/init_functions 2019-10-30 00:40:58.000000000 +1100
+++ b/init_functions 2019-11-02 18:24:10.000000000 +1100
@@ -298,21 +298,9 @@
elif bitfield_has_bit "$fsckret" 128; then
err "fatal error invoking fsck"
fi
-
- # ensure that root is going to be mounted rw. Otherwise, systemd
- # might fsck the device again. Annoy the user so that they fix this.
- if [ "${rwopt:-ro}" != 'rw' ]; then
- echo "********************** WARNING **********************"
- echo "* *"
- echo "* The root device is not configured to be mounted *"
- echo "* read-write! It may be fsck'd again later. *"
- echo "* *"
- echo "*****************************************************"
- fi
fi
}
-# TODO: this really needs to follow the logic of systemd's encode_devnode_name
# function more closely.
tag_to_udev_path() {
awk -v "tag=$1" -v "value=$2" '
This diff is collapsed.
Click to expand it.
version/28-2/PKGBUILD
0 → 100644
+
95
−
0
View file @
5dacc26b
# Obarun : 66 init/supervisor
# Maintainer : Eric Vidal <eric@obarun.org>
# Maintainer : Jean-Michel T.Dydak <jean-michel@obarun.org>
# Obarun PkgSrc : url="https://framagit.org/pkg/obcore/mkinitcpio"
#----------------
# Maintainer :
# Contributor :
# Arch PkgSrc : url="https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/mkinitcpio/"
#----------------
# Website : https://
#----------------------------------------------------------------------------
#--DESCRIPTION---------------------------------------------------------------
pkgname
=
mkinitcpio
pkgdesc
=
"Modular initramfs image creation utility"
pkgver
=
28
pkgrel
=
2
url
=
"https://projects.archlinux.org/mkinitcpio.git/"
source
=(
"https://sources.archlinux.org/other/
${
pkgname
}
/
${
pkgname
}
-
$pkgver
.tar.gz"
'0003-remove-systemd.patch'
)
#--BUILD CONFIGURATION-------------------------------------------------------
makedepends
=(
'asciidoc'
'git'
'sed'
)
#--BUILD PREPARATION---------------------------------------------------------
prepare
()
{
cd
"
$pkgname
-
$pkgver
"
# Apply 0003-remove-systemd.patch
patch
-Np1
<
$srcdir
/0003-remove-systemd.patch
}
#--BUILD---------------------------------------------------------------------
#--CHECK---------------------------------------------------------------------
check
()
{
make
-C
"
$pkgname
-
$pkgver
"
check
}
#--PACKAGE-------------------------------------------------------------------
package
()
{
make
-C
"
${
pkgname
}
-
$pkgver
"
DESTDIR
=
"
$pkgdir
"
install
}
#--INSTALL CONFIGURATION-----------------------------------------------------
arch
=(
x86_64
)
install
=
mkinitcpio.install
backup
=(
'etc/mkinitcpio.conf'
)
depends
=(
'mkinitcpio-busybox>=1.19.4-2'
'kmod'
'util-linux>=2.23'
'libarchive'
'coreutils'
'awk'
'bash'
'findutils'
'grep'
'filesystem>=2011.10-1'
'gzip'
'lz4'
'sed'
)
optdepends
=(
'xz: Use lzma or xz compression for the initramfs image'
'bzip2: Use bzip2 compression for the initramfs image'
'lzop: Use lzo compression for the initramfs image'
'lz4: Use lz4 compression for the initramfs image'
'mkinitcpio-nfs-utils: Support for root filesystem on NFS'
)
provides
=(
"mkinitcpio=
${
pkgver
}
-
${
pkgrel
}
"
"initramfs"
)
#--SECURITY AND LICENCE------------------------------------------------------
license
=(
'GPL'
)
sha256sums
=(
'bf83a158786d272d8046a4dd48bfcc343ec37de2cae0ae65c59132a45744808c'
'75ad8f0fb8115410c757027d39cd85b4b0df62366287e043163cb1264f86405b'
)
This diff is collapsed.
Click to expand it.
version/28-2/mkinitcpio.install
0 → 100644
+
15
−
0
View file @
5dacc26b
#!/bin/sh
post_upgrade
()
{
if
[
"$(vercmp 0.9.0 "
$
2
")"
-
eq
1
];
then
printf
'==> If your /usr is on a separate partition, you must add the "usr" hook\n'
printf
' to /etc/mkinitcpio.conf and regenerate your images before rebooting\n'
fi
if
[
"$(vercmp 0.12.0 "
$
2
")"
-
eq
1
];
then
printf
'==> The "block" hook has replaced several hooks:\n'
printf
' fw, sata, pata, scsi, virtio, mmc, usb\n'
printf
' Replace any and all of these in /etc/mkinitcpio.conf with a single\n'
printf
' instance of the "block" hook\n'
fi
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment