Chakra_Linux/core
1
0
Fork 0
mirror of https://gitdl.cn/https://github.com/chakralinux/core.git synced 2025-01-24 02:22:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

continued work on moving all out of /lib, new filesystem for util-linux changes, moved locale.sh from systemd, bzip2 rebuild for move

Browse Source
This commit is contained in:
abveritas 2012-11-13 17:17:46 +00:00
parent 8c74e6d261
commit 0a6e1d10f1
8 changed files with 44 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
bzip2/PKGBUILD
View File

@ -1,22 +1,18 @@
# #
# Core Packages for Chakra, part of chakra-project.org # Core Packages for Chakra, part of chakra-project.org
# #
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org> # maintainer abveritas@chakra-project.org
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
pkgname=bzip2 pkgname=bzip2
pkgver=1.0.6 pkgver=1.0.6
pkgrel=3 pkgrel=4
pkgdesc="A high-quality data compression program" pkgdesc="A high-quality data compression program"
arch=('i686' 'x86_64') arch=('x86_64')
license=('custom') license=('custom')
url="http://sources.redhat.com/bzip2" url="http://sources.redhat.com/bzip2"
groups=('base') groups=('base')
depends=('glibc') depends=('glibc')
source=(http://www.bzip.org/$pkgver/bzip2-$pkgver.tar.gz) source=("http://www.bzip.org/$pkgver/bzip2-$pkgver.tar.gz")
md5sums=('00b516f4704d4a7cb50a1d97e6e8e15b') md5sums=('00b516f4704d4a7cb50a1d97e6e8e15b')
build() { build() {
@ -31,27 +27,32 @@ build() {
make -f Makefile-libbz2_so make -f Makefile-libbz2_so
make bzip2recover libbz2.a make bzip2recover libbz2.a
}
install -dm755 $pkgdir/bin check() {
install -m755 bzip2-shared $pkgdir/bin/bzip2 cd "$srcdir/$pkgname-$pkgver"
install -m755 bzip2recover $pkgdir/bin make test
ln -sf bzip2 $pkgdir/bin/bunzip2 }
ln -sf bzip2 $pkgdir/bin/bzcat
install -dm755 $pkgdir/usr/bin package() {
install -m755 bzdiff bzgrep bzmore $pkgdir/usr/bin cd "$srcdir/$pkgname-$pkgver"
install -Dm755 libbz2.so.1.0.6 $pkgdir/lib/libbz2.so.1.0.6 install -dm755 $pkgdir/usr/{bin,lib,include,share/man/man1}
ln -s libbz2.so.1.0.6 $pkgdir/lib/libbz2.so
ln -s libbz2.so.1.0.6 $pkgdir/lib/libbz2.so.1
ln -s libbz2.so.1.0.6 $pkgdir/lib/libbz2.so.1.0
install -Dm644 libbz2.a ${pkgdir}/usr/lib/libbz2.a install -m755 bzip2-shared $pkgdir/usr/bin/bzip2
ln -sf ../../lib/libbz2.so ${pkgdir}/usr/lib/libbz2.so install -m755 bzip2recover bzdiff bzgrep bzmore $pkgdir/usr/bin
ln -sf bzip2 $pkgdir/usr/bin/bunzip2
ln -sf bzip2 $pkgdir/usr/bin/bzcat
install -Dm644 bzlib.h $pkgdir/usr/include/bzlib.h install -m755 libbz2.so.1.0.6 $pkgdir/usr/lib
ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so
ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so.1
ln -s libbz2.so.1.0.6 $pkgdir/usr/lib/libbz2.so.1.0
install -m644 libbz2.a ${pkgdir}/usr/lib/libbz2.a
install -Dm644 bzip2.1 $pkgdir/usr/share/man/man1/bzip2.1 install -m644 bzlib.h $pkgdir/usr/include/
install -m644 bzip2.1 $pkgdir/usr/share/man/man1/
ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bunzip2.1 ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bunzip2.1
ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bzcat.1 ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bzcat.1
ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bzip2recover.1 ln -sf bzip2.1 $pkgdir/usr/share/man/man1/bzip2recover.1

20
filesystem/PKGBUILD
View File

@ -5,17 +5,17 @@
# maintainer Manuel Tortosa <manutortosa[at]chakra-project[dot]org> # maintainer Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
pkgname=filesystem pkgname=filesystem
pkgver=2012.8 pkgver=2012.11
pkgrel=1 pkgrel=1
_codename=Claire _codename=Claire
pkgdesc='Base filesystem' pkgdesc='Base filesystem'
arch=('any') arch=('x86_64')
license=('GPL') license=('GPL')
url='http://www.chakra-project.org' url='http://www.chakra-project.org'
groups=('base') groups=('base')
install='filesystem.install' install='filesystem.install'
options=('force')
depends=('iana-etc' 'bash' 'coreutils') depends=('iana-etc' 'bash' 'coreutils')
makedepends=('asciidoc')
backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc/passwd' backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc/passwd'
'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf' 'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf'
'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue' 'etc/hostname' 'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue' 'etc/hostname'
@ -23,15 +23,15 @@ backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc
source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf' source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf'
'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'hostname' 'motd' 'resolv.conf' 'shells' 'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'hostname' 'motd' 'resolv.conf' 'shells'
'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first' 'machine-info' 'os-release' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first' 'machine-info' 'os-release'
'vconsole.conf') 'vconsole.conf' 'locale.sh')
md5sums=('45940618da782cc391c59f88ab3333c3' md5sums=('004013ac940ef3d3cdd8c596e7accfe1'
'8266bc7566e99f2b5f5e0b5b1ac17241' '8266bc7566e99f2b5f5e0b5b1ac17241'
'13753e4e0964f3652b0cc60a28528bdf' '13753e4e0964f3652b0cc60a28528bdf'
'4c4540eeb748bf1f71d631b8c1dcf0b3' '4c4540eeb748bf1f71d631b8c1dcf0b3'
'f28150d4c0b22a017be51b9f7f9977ed' 'f28150d4c0b22a017be51b9f7f9977ed'
'6e488ffecc8ba142c0cf7e2d7aeb832e' '6e488ffecc8ba142c0cf7e2d7aeb832e'
'8a9042a2cedf6b6b47eb8973f14289cb' '455b78cada80f40b6f6968f5cbd97a2e'
'b8355d9d2782f424f4cedcf682651be0' '01249bb0ba4468f95e2cc3a627f5e6e3'
'ca716f853860199c1286e7939b2f2666' 'ca716f853860199c1286e7939b2f2666'
'a367150bd0fe6b02114365121de64a53' 'a367150bd0fe6b02114365121de64a53'
'7bc65f234dfb6abf24e7c3b03e86f4ff' '7bc65f234dfb6abf24e7c3b03e86f4ff'
@ -39,12 +39,13 @@ md5sums=('45940618da782cc391c59f88ab3333c3'
'd41d8cd98f00b204e9800998ecf8427e' 'd41d8cd98f00b204e9800998ecf8427e'
'6f48288b6fcaf0065fcb7b0e525413e0' '6f48288b6fcaf0065fcb7b0e525413e0'
'22518e922891f9359f971f4f5b4e793c' '22518e922891f9359f971f4f5b4e793c'
'f95416882cef800edef08382a1176b7d' '677523dbe94b79299aa91b35ed8203b6'
'f3b6ae7db8adffaaa4bffc6099dcbd50' 'f3b6ae7db8adffaaa4bffc6099dcbd50'
'a8a962370cd0128465d514e6a1f74130' 'a8a962370cd0128465d514e6a1f74130'
'8aba0b33527e812211b9e5f9b87887ae' '8aba0b33527e812211b9e5f9b87887ae'
'ad64ad33ec45e4f87c6bf225a91ff484' 'ad64ad33ec45e4f87c6bf225a91ff484'
'201bbb8b4734d2f46afe1e24d7cc6173') '201bbb8b4734d2f46afe1e24d7cc6173'
'45100e8a4a6d8d4b3a7dcd34b0fa4281')
package() { package() {
cd ${pkgdir} cd ${pkgdir}
@ -73,6 +74,7 @@ package() {
done done
touch etc/chakra-release touch etc/chakra-release
install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first usr/lib/modprobe.d/usb-load-ehci-first.conf install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first usr/lib/modprobe.d/usb-load-ehci-first.conf
install -m755 ${srcdir}/locale.sh etc/profile.d/locale.sh
# setup /var # setup /var
for d in cache/man local opt log/old lib/misc empty; do for d in cache/man local opt log/old lib/misc empty; do

4
filesystem/filesystem.install
View File

@ -41,8 +41,10 @@ post_upgrade() {
_addgroup scanner -g 96 _addgroup scanner -g 96
_addgroup rfkill -g 24 _addgroup rfkill -g 24
_addgroup lock -g 54 _addgroup lock -g 54
_addgroup uuidd -g 68
_adduser uuidd -u 68 -d / -g uuidd -s /sbin/nologin
# sync gshadow to group (fixes FS#19869 # sync gshadow to group
if ! grep -q '^lock:' etc/gshadow; then if ! grep -q '^lock:' etc/gshadow; then
grpconv >/dev/null grpconv >/dev/null
fi fi

1
filesystem/group
View File

@ -20,6 +20,7 @@ smmsp:x:25:
http:x:33: http:x:33:
games:x:50: games:x:50:
lock:x:54: lock:x:54:
uuidd:x:68:
network:x:90: network:x:90:
video:x:91: video:x:91:
audio:x:92: audio:x:92:

1
filesystem/gshadow
View File

@ -20,6 +20,7 @@ smmsp:::
http::: http:::
games::: games:::
lock::: lock:::
uuidd:!::
network:x:: network:x::
video:x:: video:x::
audio::: audio:::

1
filesystem/passwd
View File

@ -4,4 +4,5 @@ daemon:x:2:2:daemon:/sbin:/bin/false
mail:x:8:12:mail:/var/spool/mail:/bin/false mail:x:8:12:mail:/var/spool/mail:/bin/false
ftp:x:14:11:ftp:/srv/ftp:/bin/false ftp:x:14:11:ftp:/srv/ftp:/bin/false
http:x:33:33:http:/srv/http:/bin/false http:x:33:33:http:/srv/http:/bin/false
uuidd:x:68:68:uuidd:/:/sbin/nologin
nobody:x:99:99:nobody:/:/bin/false nobody:x:99:99:nobody:/:/bin/false

1
filesystem/shadow
View File

@ -4,4 +4,5 @@ daemon:x:14871::::::
mail:x:14871:::::: mail:x:14871::::::
ftp:x:14871:::::: ftp:x:14871::::::
http:x:14871:::::: http:x:14871::::::
uuidd:x:14871::::::
nobody:x:14871:::::: nobody:x:14871::::::

8
systemd/PKGBUILD
View File

@ -5,8 +5,8 @@
pkgname=systemd pkgname=systemd
pkgver=195 pkgver=195
pkgrel=1 pkgrel=2
arch=('i686' 'x86_64') arch=('x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd" url="http://www.freedesktop.org/wiki/Software/systemd"
license=('GPL2' 'LGPL2.1' 'MIT') license=('GPL2' 'LGPL2.1' 'MIT')
depends=('acl' 'bash' 'glibc' 'glib2' 'kmod' 'hwids' 'util-linux' 'kbd' 'kmod' 'libcap' 'libxslt' depends=('acl' 'bash' 'glibc' 'glib2' 'kmod' 'hwids' 'util-linux' 'kbd' 'kmod' 'libcap' 'libxslt'
@ -35,7 +35,6 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
'initcpio-install-udev' 'initcpio-install-udev'
'initcpio-install-timestamp' 'initcpio-install-timestamp'
'0001-Reinstate-TIMEOUT-handling.patch' '0001-Reinstate-TIMEOUT-handling.patch'
'locale.sh'
'use-split-usr-path.patch' 'use-split-usr-path.patch'
'99-default.preset') '99-default.preset')
md5sums=('38e8c8144e7e6e5bc3ce32eb4260e680' md5sums=('38e8c8144e7e6e5bc3ce32eb4260e680'
@ -43,7 +42,6 @@ md5sums=('38e8c8144e7e6e5bc3ce32eb4260e680'
'fb37e34ea006c79be1c54cbb0f803414' 'fb37e34ea006c79be1c54cbb0f803414'
'df69615503ad293c9ddf9d8b7755282d' 'df69615503ad293c9ddf9d8b7755282d'
'5543be25f205f853a21fa5ee68e03f0d' '5543be25f205f853a21fa5ee68e03f0d'
'f15956945052bb911e5df81cf5e7e5dc'
'58f26fd4cdcac88bd3ca690f4d3e3e99' '58f26fd4cdcac88bd3ca690f4d3e3e99'
'a1bf25da736d3719e9720b2e4caea341') 'a1bf25da736d3719e9720b2e4caea341')
@ -106,8 +104,6 @@ package() {
ln -s '../usr/lib/systemd/systemd' "$pkgdir/sbin/init" ln -s '../usr/lib/systemd/systemd' "$pkgdir/sbin/init"
install -Dm755 "$srcdir/locale.sh" "$pkgdir/etc/profile.d/locale.sh"
# the path to udevadm is hardcoded in some places # the path to udevadm is hardcoded in some places
install -d "$pkgdir/sbin" install -d "$pkgdir/sbin"
ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm" ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm"