Skip to content

Commit

Permalink
Merge pull request #701 from mariux64/update-to-polkit-0.113+
Browse files Browse the repository at this point in the history
Update polkit from 0.104 to 0.113+git_2919920+js38 and use systemd-logind
  • Loading branch information
pmenzel authored Apr 4, 2018
2 parents 4e5d370 + 6942895 commit 5862b61
Show file tree
Hide file tree
Showing 4 changed files with 193 additions and 37 deletions.
103 changes: 103 additions & 0 deletions js.be0
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
#!/usr/bin/env beesh

# BEE_VERSION js-38.2.1-0

## this file was created by bee init and should be executed to build a
## bee-package. (Additional hints are located at the end of this file.)

###############################################################################
## The source URL(s) define the location of the sources that will be
## downloaded. Version variables may be used to simplify reuse of this bee-file.

SRCURL[0]="http://anduin.linuxfromscratch.org/BLFS/mozjs/mozjs-${PKGVERSION}.rc0.tar.bz2"

###############################################################################
## Add URLs/pathes to patch files to the PATCHURL array.
## The sources will be patched in the order of the array.

# PATCHURL+=(/src/mariux/patches/js38-38.2.1-upstream_fixes-2.patch)

###############################################################################
## Add filename patterns to the EXCLUDE array of files that should not
## be added to you package but may be present in the image directory.

# EXCLUDE+=()

###############################################################################
## Uncomment the next statement, if the software may not be able to be built
## outside the source directory and needs to be built inside the source
## directory.

# build_in_sourcedir

###############################################################################
## bee cannot detect buildtypes specified in subdirectories.
## Sometimes packages "hide" the real sources in a subdirectory named
## 'src' or 'cmake' or ..
## use 'sourcesubdir_append' to specify this directory if known.

sourcesubdir_append js/src


###############################################################################
## Change the default (auto-detected) steps to
## extract, patch, configure/setup, build and install the software.
## Make sure the mee_install function does install everything to the
## image directory "${D}"

#mee_extract() {
# bee_extract "${@}"
#}

mee_patch() {
# Work around sourcesubdir_append and paths in patch
start_cmd cd ../.. ; patch -N -p1 -i /src/mariux/patches/js38-38.2.1-upstream_fixes-2.patch
bee_patch "${@}"
}

mee_configure() {
bee_configure \
--with-intl-api \
--with-system-zlib \
--with-system-ffi \
--with-system-nspr \
--with-system-icu \
--enable-threadsafe \
--enable-readline
}

#mee_build() {
# bee_build
#}

#mee_install() {
# bee_install
#}
## by default this may be 'make install DESTDIR="${D}"'

mee_install_post() {
for link in `find ${D}/usr/include/mozjs-38 -type l`; do
header=`readlink $link`
rm -f $link
cp -pv $header $link
chmod 644 $link
done
}

###############################################################################
##
## Additional hints:
##
## The name of this bee-file should follow the following naming convention:
## pkgname-pkgversion-pkgrevision.bee
##
## You may remove all comments as long as SRCURL[0] is set.
##
## Everything in this file will be executed in a bash environment.
##
## Build the package by executing
## './pkg-version-N.bee' or
## 'beesh ./pkg-version-N.bee'
##
## see http://beezinga.org/
##
37 changes: 0 additions & 37 deletions polkit-0.104-1.bee

This file was deleted.

87 changes: 87 additions & 0 deletions polkit.be0
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
#!/usr/bin/env beesh

# BEE_VERSION polkit-0.113_lfs-0

## this file was created by bee init and should be executed to build a
## bee-package. (Additional hints are located at the end of this file.)

###############################################################################
## The source URL(s) define the location of the sources that will be
## downloaded. Version variables may be used to simplify reuse of this bee-file.

SRCURL[0]="http://anduin.linuxfromscratch.org/BLFS/polkit/polkit-0.113+git_2919920+js38.tar.xz"

###############################################################################
## Add URLs/pathes to patch files to the PATCHURL array.
## The sources will be patched in the order of the array.

# PATCHURL+=()

###############################################################################
## Add filename patterns to the EXCLUDE array of files that should not
## be added to you package but may be present in the image directory.

# EXCLUDE+=()

###############################################################################
## Uncomment the next statement, if the software may not be able to be built
## outside the source directory and needs to be built inside the source
## directory.

# build_in_sourcedir

###############################################################################
## bee cannot detect buildtypes specified in subdirectories.
## Sometimes packages "hide" the real sources in a subdirectory named
## 'src' or 'cmake' or ..
## use 'sourcesubdir_append' to specify this directory if known.

# sourcesubdir_append src

LIBEXECDIR=/usr/lib/polkit-1

###############################################################################
## Change the default (auto-detected) steps to
## extract, patch, configure/setup, build and install the software.
## Make sure the mee_install function does install everything to the
## image directory "${D}"

#mee_extract() {
# bee_extract "${@}"
#}

#mee_patch() {
# bee_patch "${@}"
#}

mee_configure() {
bee_configure \
--disable-static
}

#mee_build() {
# bee_build
#}

#mee_install() {
# bee_install
#}
## by default this may be 'make install DESTDIR="${D}"'

###############################################################################
##
## Additional hints:
##
## The name of this bee-file should follow the following naming convention:
## pkgname-pkgversion-pkgrevision.bee
##
## You may remove all comments as long as SRCURL[0] is set.
##
## Everything in this file will be executed in a bash environment.
##
## Build the package by executing
## './pkg-version-N.bee' or
## 'beesh ./pkg-version-N.bee'
##
## see http://beezinga.org/
##
3 changes: 3 additions & 0 deletions scripts/update-systemd-from-27-to-238.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,11 @@ bee update -f util-linux-2.31.1-1 xorg-server pulseaudio libgudev libusb xf86-in
bee remove systemd-27-0.x86_64
bee update -f systemd-238-0
bee install udev_compat-1.0-0 qtwebkit-5.9.0-0
bee install js-38.2.1-0
bee update polkit
systemctl daemon-reload
systemctl disable console-kit-daemon
# systemctl restart polkit.service # we are going to reboot anyway

sed -i '/pam_ck_connector.so/d' /etc/pam.d/system-auth
sed -i 's/required pam_systemd.so create-session=1 kill-user=0 kill-session=0/optional pam_systemd.so/' /etc/pam.d/system-auth
Expand Down

0 comments on commit 5862b61

Please sign in to comment.